vettkjekåegcommitteher
la te ei klokka visst mi vil bruga den

meeen ferkje implementert ann
lol
klokka in the house
Merge remote-tracking branch 'origin/Design' into Design

Conflicts:
	.gitignore
	nbproject/private/private.properties
	web/index.xhtml
	web/teacher/menu.xhtml