asdasd
huhmkm
Merge branch 'Jessica'
asdasdas
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
casd
asfasMerge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml