Astar incorporation.
Merge remote-tracking branch 'remotes/Dani/master'
Merge remote-tracking branch 'remotes/Edu/master'
Activation A-star.
Merge remote-tracking branch 'remotes/Dani/master'

Conflicts:
	src/cEnemyPersecutor.cpp
Final del joc.
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Enemy attacks!
Merge remote-tracking branch 'remotes/Dani/master'

Conflicts:
	src/cEnemyPersecutor.h
Merge remote-tracking branch 'remotes/Edu/master'
Merge branch 'master' of https://github.com/roig/MVJ2D
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D
enemies