frutas y barra de vida
Merge branch 'master' of github.com:ggjpepe/pepe

* 'master' of github.com:ggjpepe/pepe:
  fondos bonitos
  Gravity fixed.
  changes in the player
  Ahora si terminado Enemies

Conflicts:
	js/main2.js
	js/player.js
merge
minor fix of the last merge
game over y frutas
Merge branch 'master' of github.com:ggjpepe/pepe

* 'master' of github.com:ggjpepe/pepe:
  honeycomb
  ZOMBIE OF ABSOLUTE TERROR