asdasdasd
kl
asdas
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml