Forprosjekt
Merge branch 'master' of https://github.com/Temestokles/gruppeweb

Conflicts:
	forprosjekt.html