++
++
TODO PETE FINAL...
Merge branch 'master' of https://github.com/ebroto/MVJ2D
Merge branch 'master' of http://github.com/marcelgozalbo/MVJ2D
Animacio quan toquen al jugador (estat nou)
Merge remote-tracking branch 'remotes/Dani/master'

Conflicts:
	src/cPlayer.cpp
	src/cPlayer.h