jkbjl
Merge branch 'Jessica'

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

Conflicts:
	Spelprojekt/OptionsMeny.cpp
	Spelprojekt/Resources/Data/Settings.xml
asdasdMerge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml