ejjkasdfoqefdfhkhjkasdhklashdfklahrdklqwr23uropefjkkdkdfoapd	plaeföfoapfkaklfjqofqo
fasdasd
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
sasegserg
f
Merge branch 'bella'