Gåturgreier
Merge branch 'master' of https://github.com/lrasern/prototypingoblig3

Conflicts:
	hovedside.html