OKEJSISTA
asda
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'sean'