gfuob
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
asdasd
Merge branch 'robin'
asdasf
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml