sdssd
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
asdasdas
Merge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
	Spelprojekt/Spelprojekt.vcxproj.filters
hejjj sean här
asdasd