fml
Merge branch 'master' of https://github.com/stinemarie/webprosjekt32

Conflicts:
	Prosjektrapport HTML/prosjektrapport.html