Merge branch 'master' of https://github.com/roig/MVJ2D
++
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D

Conflicts:
	src/cPlayer.cpp
	src/cPlayer.h
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D

Conflicts:
	src/cPlayer.cpp
Player Die Anim done.
Merge branch 'master' of https://github.com/ebroto/MVJ2D

Conflicts:
	src/cPlayer.cpp
	src/cPlayer.h
heart sound
Merge branch 'master' of https://github.com/roig/MVJ2D
snds
snd++
Merge remote-tracking branch 'remotes/Dani/master'
Merge remote-tracking branch 'remotes/Edu/master'