proban
Merge branch 'master' of https://github.com/albertalma/Megaman

Conflicts:
	cBicho.cpp