hämtar sofies kod
Merge branch 'master' of https://github.com/akiana/openhourssthlm

Conflicts:
	index.html