tilføjet mere indhold til forside
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
ups
mere godt indhold
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html