Some fixes
Collide detection
Resetting lives back to three
Merge pull request #392 from ping19/master

Couple updates plus fixes