asdasd
asdasdas
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml