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
asdasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt

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

Conflicts:
	Spelprojekt/Camera.cpp
	Spelprojekt/Resources/Data/Settings.xml
asfasf
dfgf
Merge branch 'Jessica'
asdasdasd
gfsdfvsdf
Merge branch 'sean'
Merge branch 'robin'

Conflicts:
	Spelprojekt/Spelprojekt.vcxproj.filters
	Spelprojekt/StartMeny.cpp
asdasd
guibsdvvf