kola in det här!!
Merge branch 'bella'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
dfsdfdf
Merge branch 'Jessica'
hhh
Conflicts:
	Spelprojekt/WindowManager.h
asdasdasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
asd
afasgf
asgMerge branch 'sean'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml