Updated more collision detection, see Description

Player is now collideable with enemies. Player can shoot enemies and
they disappear. Bullets that hit player now disappear.
Merge remote-tracking branch 'origin/master'

Conflicts:
	enemy.py
	enemy.pyc
	engine.pyc
	player.pyc
	snowball.pyc