hej collision funkar kaaasss
asdasd
Merge branch 'master' of https://github.com/Omnes/Spelprojekt
fixad collision
hej
Merge branch 'sean'
nytt
Merge branch 'Jessica'

Conflicts:
	Spelprojekt/Game.cpp
asd
dasdasdasd