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

Conflicts:
	Websiden/nyStyle.css