Göte
Merge branch 'master' of https://github.com/TimMelker/Projektarbete

Conflicts:
	footer.php
	index.php
	style.css