diff --git a/main.md b/main.md
index b0adb45..063f973 100644
--- a/main.md
+++ b/main.md
@@ -28,19 +28,24 @@ men som er viktig for å forstå innholdet.
---
-## Generelt
+## Hva er Informasjonsteknologi
-Hva er IT
-
-Kort Historie
+- Flytting og prossesering av data
+- Datamaskiner
+- Punchcards
+- Elektroniske datamaskiner
+- Nettverk
---
-### Folk som er viktige
+### Et par viktige personer
-
-
-- Von Neumann
+- Ada Lovelace: Verdens første programmør
+- Herman Hollerith: Punchcards og matematikk
+- Konrad Zuse: Verdens første programmerbare datamaskin
+- John von Neumann: Diverse, Neumann-arkitektur
+- Alan Turing – Matematisk grunnlag for datamaskin
+- Douglas Engelbart – Datamusen, mye interaksjondesign
---
@@ -51,7 +56,7 @@ Kort Historie
- - PC
+ - PC
- Operativsystem
- Abstraksjon
- Transistorer
@@ -62,7 +67,6 @@ Kort Historie
- Hardware
- Software
- - Kernel
- Protokoll
- WWW/Internet
- High level/Low level
@@ -78,21 +82,138 @@ Forklar hvordan en transistor funker
----
-
-
@@ -146,6 +267,8 @@ Objekter
### ASCII, UNICODE, UTF-8
+
+
---
@@ -298,6 +421,8 @@ brukt ca. 20 min
- Signed magnitude
- Two's compliment
+TODO: add diagrams
+
Note:
Signed magnitude
@@ -354,10 +479,6 @@ Ikke veldig viktig, men kan være oppklarende.
- CPU
- Minne
----
-
-# Datamaskin
-
Note:
Består av mange forskjellige biter.
@@ -393,6 +514,11 @@ Setter du disse på rad, så har du et program.
----
+### Arithmetic Logic Unit (ALU)
+### & Control Unit (CU)
+
+----
+
### Fetch-Decode-Execute Cycle
@@ -463,8 +589,6 @@ Setter du disse på rad, så har du et program.
EX
-
-
Note:
*5 steg* hver gang den skal kjøre en instruksjon
@@ -512,21 +636,42 @@ CD, DVD, Ekstern harddisk, USB, osv.
---
+### Datamaskin
+
+
+
+
+- Hovedkort
+- CPU
+- Minne (Primær og Sekundær)
+
+
- ADC - inn på computeren
- DAC - ut fra computeren
@@ -609,7 +754,7 @@ Regn ut 1920x1080 x 24 bits
-
+
@@ -620,7 +765,7 @@ Regn ut 1920x1080 x 24 bits
-\\[ 16\ bits \cdot 44100\ Hz \cdot (3 \cdot 60)s \cdot 2\ kanaler \\]
+\\[ 16\ bits \cdot 44100\ Hz \cdot (3 \cdot 60)s \cdot 2\ kanaler \\]
Note:
@@ -630,8 +775,9 @@ tegn en bølge på tavlen, og vis frekvensen
## Encoding og Komprimering
- - "Hvordan tolke dataen"
- - Lossless vs lossy
+ - Encoding: "Hvordan tolke dataen"
+ - "Codec"
+ - Lossless & lossy
Note:
@@ -663,19 +809,48 @@ Note:
ikke vanlig for tekst, men akseptabelt for video/lyd/bilde
Gjøres ofte på tjenester som messenger.
+----
+
+
+
+----
+
+
+
---
+
+
+
+
# Algoritmer
+
+
+##### Pseudokode
+
+```txt
+function gcd(a, b)
+ while a ≠ b
+ if a > b
+ a := a − b
+ else
+ b := b − a
+ return a
+```
+
+
+
+
+
+
+
+
Note:
Beskriver stegvis og nøyaktig hvordan man løser et problem
Uten tolkning
Pseudokode
-----
-
-(Eksempel på pseudokode)
-
---
## Kompleksitet
@@ -743,13 +918,13 @@ Sorteringsalgortimer:
---
-# Nettverk
+
---
## Internett
-- Hva er det
+
----
@@ -772,14 +947,19 @@ Ikke veldig planlagt
-
+
-
-
-
-
-
-
+
+
+##### Pakke
+
+
+
+
+
+
+
+
diff --git a/sources.txt b/sources.txt
index a5dd272..097f0ad 100644
--- a/sources.txt
+++ b/sources.txt
@@ -8,3 +8,5 @@ https://commons.wikimedia.org/wiki/File:Subpixel_rendering_LCD_photo_3e_composit
https://commons.wikimedia.org/wiki/File:4-bit-linear-PCM.svg
https://www.righto.com/2015/12/
https://www.pngall.com/cpu-png/download/86141
+https://hackaday.com/2019/05/09/cpu-made-from-74hc-chips-is-a-glorious-mess/
+https://en.wikipedia.org/wiki/Algorithm#/media/File:Euclid_flowchart.svg
diff --git a/static/graphics/algorithm_definition.png b/static/graphics/algorithm_definition.png
new file mode 100644
index 0000000..ebe938e
Binary files /dev/null and b/static/graphics/algorithm_definition.png differ
diff --git a/static/graphics/ascii.svg b/static/graphics/ascii.svg
new file mode 100644
index 0000000..5f63f2a
--- /dev/null
+++ b/static/graphics/ascii.svg
@@ -0,0 +1,170 @@
+
+
+
+
diff --git a/static/graphics/euclid_algorithm.svg b/static/graphics/euclid_algorithm.svg
new file mode 100644
index 0000000..61ba302
--- /dev/null
+++ b/static/graphics/euclid_algorithm.svg
@@ -0,0 +1,557 @@
+
+
diff --git a/static/graphics/messy-breadboard.jpg b/static/graphics/messy-breadboard.jpg
new file mode 100644
index 0000000..276c4a8
Binary files /dev/null and b/static/graphics/messy-breadboard.jpg differ
diff --git a/static/graphics/network_connect_four.png b/static/graphics/network_connect_four.png
new file mode 100644
index 0000000..00492be
Binary files /dev/null and b/static/graphics/network_connect_four.png differ
diff --git a/static/graphics/sources/ASCII-Table.svg b/static/graphics/sources/ASCII-Table.svg
new file mode 100644
index 0000000..a8682bd
--- /dev/null
+++ b/static/graphics/sources/ASCII-Table.svg
@@ -0,0 +1,165 @@
+
+
+
diff --git a/static/graphics/sources/BC548_NPN_Transistor.svg b/static/graphics/sources/BC548_NPN_Transistor.svg
new file mode 100644
index 0000000..3301adc
--- /dev/null
+++ b/static/graphics/sources/BC548_NPN_Transistor.svg
@@ -0,0 +1,693 @@
+
+
\ No newline at end of file
diff --git a/static/graphics/sources/Euclid_flowchart.svg b/static/graphics/sources/Euclid_flowchart.svg
new file mode 100644
index 0000000..21d3b93
--- /dev/null
+++ b/static/graphics/sources/Euclid_flowchart.svg
@@ -0,0 +1,550 @@
+
+
diff --git a/static/graphics/sources/ndiTGW9.jpeg b/static/graphics/sources/ndiTGW9.jpeg
new file mode 100644
index 0000000..3bccf1e
Binary files /dev/null and b/static/graphics/sources/ndiTGW9.jpeg differ
diff --git a/static/graphics/sources/router.svg b/static/graphics/sources/router.svg
new file mode 100644
index 0000000..5745514
--- /dev/null
+++ b/static/graphics/sources/router.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/static/graphics/sources/router_white.svg b/static/graphics/sources/router_white.svg
new file mode 100644
index 0000000..3721ebc
--- /dev/null
+++ b/static/graphics/sources/router_white.svg
@@ -0,0 +1,122 @@
+
+
+
+
diff --git a/static/graphics/sources/router_white2.svg b/static/graphics/sources/router_white2.svg
new file mode 100644
index 0000000..89a83f1
--- /dev/null
+++ b/static/graphics/sources/router_white2.svg
@@ -0,0 +1,129 @@
+
+
+
+
diff --git a/static/graphics/transistor.svg b/static/graphics/transistor.svg
new file mode 100644
index 0000000..2e7bd4f
--- /dev/null
+++ b/static/graphics/transistor.svg
@@ -0,0 +1,598 @@
+
+