tweaked the jumping hit collision detection
adjusted the level a little to test gameplay
Merge branch 'master' of https://github.com/fgcfernando/mauro

Conflicts:
	js/entities/entities.js