Git commit -a
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml