first player controls, collision
Merge remote-tracking branch 'origin/master' into gh-pages
t-35: first controls