Putas colisiones hechas!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	cBicho.cpp
Merge branch 'master' of https://github.com/albertalma/Megaman