asd
aMerge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
asdasd
jag akark
huhmkm
Merge branch 'Jessica'
asdasdas
Merge branch 'robin'

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

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
hej jalalalla
asdasdasd
kl
asdas
ull
sad
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
Merge branch 'robin'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml