Made local branch for collision
Merge branch 'master'
Collision stuff
Merge branch 'master'
Nothing
Merge branch 'master'
Added more collision stuff and fixed weird conflict
Fixed conflicts
Merge branch 'master'
Merge branch 'master'
Collision detection first working iteration
Merge branch 'master'
smallfix
Merge branch 'master'