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

Conflicts:
	style.css
Merge branch 'master' of https://github.com/TimMelker/Projektarbete

Conflicts:
	style.css