level_uranus
Merge branch 'master' into level_design_urano

Conflicts:
	src/scenes/Level2LuaScene.js
	src/scenes/Level6UranoScene.js
Merge branch 'level_design_urano'
Merge

Merge branch 'master' of https://github.com/startupcursos/jogo-acao

Conflicts:
	src/scenes/Level2LuaScene.js