Fix collisions!
Merge branch 'master' of github.com:kurrik/ld26