working on collision detection
Merge branch 'master' into collision
in the middle of adding collision detection
more slight progress
not crashing any more! collision detection not working, though.
colliding, but getting stuck. x and y proximity both need to be checked.
sort of got collision detection working. needs tweaks.
Merge branch 'collision-backtrack'