asdasda
asdasd
Merge branch 'master' into robin

Conflicts:
	Spelprojekt/Spelprojekt.vcxproj.filters
asdasdasd
Merge branch 'robin'
pswgsgd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'bella'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml