Merge pull request #4 from joshleeb/master

src/game/* : Implemented 'disable' collision detection over 'bounce back...
Merge pull request #5 from joshleeb/blocks

Merge pull request #4 from joshleeb/master