Enemies attack the player
Merge branch 'dev' of https://github.com/gabybarsky/cc3k into dev

Conflicts:
	players/player.cc
	players/player.h