Introduced idea of a zone, zones manage their own collisions with the player.
Merge branch 'master' of github.com:kurrik/ld26