hmm
Merge branch 'master' of https://github.com/antring/Gruppeprosjekt_Webtek

Conflicts:
	obsidian_pilot/public_html/cosmosreview.html
Merge branch 'master' of https://github.com/antring/Gruppeprosjekt_Webtek
Merge origin/master