g1
Fikset studentsidene slik de var
g2
d
test
test
Merge remote-tracking branch 'origin/Design' into Design

Conflicts:
	nbproject/private/private.xml
endret utseende
test2
Merge remote-tracking branch 'origin/Design' into Design

Conflicts:
	nbproject/private/private.properties
	nbproject/private/private.xml
Merge branch 'Design' of https://github.com/Gaugen/SLIT into Design

Conflicts:
	nbproject/private/private.xml
	web/resources/css/layout.css
fix
dill
netbeans mas
prøvd å fiksa lærar ting, fail
fikset menu
git
git
Jobbet med å legge til Email
git