asdasd
asdMerge branch 'sean'

Conflicts:
	Spelprojekt/Game.cpp
asdasd
aasdasdMerge branch 'robin'

Conflicts:
	Spelprojekt/Game.cpp
jknjkj
hih