Sounds!
Merge branch 'master' of https://github.com/marcelgozalbo/MVJ2D

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