Vida del PJ
Merge branch 'master' of https://github.com/ebroto/MVJ2D
++
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Colisio enemic
++
Ja es pot matar l'enemic
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Merge remote-tracking branch 'remotes/Dani/master'

Conflicts:
	src/cEnemyPersecutor.cpp