added collisionMask to enemy, bullet, and player
Merge branch 'master' of https://github.com/guspedroso/MPG