Fix faced.
Merge remote-tracking branch 'remotes/Dani/master'
Merge remote-tracking branch 'remotes/Edu/master'
REspawn nous sons
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D
Merge branch 'master' of https://github.com/ebroto/MVJ2D

Conflicts:
	src/cPlayer.cpp
Afluixem el volum de la musica.
Merge branch 'master' of https://github.com/roig/MVJ2D
10 enemies