basic Collision
Merge pull request #46 from winstonho/master

basic Collision