Lots of tile work.
Merge branch 'master' of github.com:kurrik/ld29
Fix collisions.