Merge pull request #1 from ohbbies/master

Collisions
Cleaned up collision detection
Merge pull request #1 from Mindar/master

Cleanup naming