collisions with enemies
Merge branch 'master' of https://github.com/albertalma/Megaman

Conflicts:
	cBicho.cpp
	cEnemy.cpp
	cGame.cpp
	tile1.png