very rudimentary collision detection
added health
merge conflicts
merge collision
merge collisions again, with fixes!
Merge pull request #8 from vincekyi/collision-detection

Collisions