fixing bugs with collision
Merge branch 'master' of git@github.com:andrewoid/cooperative-tetris.git