Add player collision detection
Merge branch 'master' of https://github.com/iluu/ruby-dash