Projectile Kills and Square has Collision Detection

we should do actual math at some point
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/DavidDupre/github/Game.java
	src/com/DavidDupre/github/Player.java