fawrtqeygaqe5y
Merge branch 'master' into bella

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
hej, Sean (I know what you did...) NOOB!!!!!!!!!!!!
Merge branch 'bella'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
fda
feroz är kass
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml