worldmappp
Merge branch 'sean'
asdgsdg
Merge branch 'bella'
asdasda
asdasd
Merge branch 'master' into robin

Conflicts:
	Spelprojekt/Spelprojekt.vcxproj.filters
it asdf
SEAN!!!!!!!!!!!!!
asdasdasd
Merge branch 'robin'
pswgsgd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
kola in det här!!
Merge branch 'bella'

Conflicts:
	Spelprojekt/Resources/Data/Settings.xml
Merge branch 'Jessica'
hhh
Conflicts:
	Spelprojekt/WindowManager.h