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

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

Conflicts:
	obsidian_pilot/public_html/movies.html