35-Sistema-de-Vidas
closes #35
Merge branch 'master' into 35-Sistema-de-Vidas

Conflicts:
	src/scenes/LevelOneScene.js
Merge pull request #48 from startupcursos/35-Sistema-de-Vidas

35-Sistema-de-Vidas