art erick
Merge branch 'master' into concept-art-erick

Conflicts:
	src/layers/GameLayer.js
	src/sprites/Roda.js
Merge pull request #63 from startupcursos/concept-art-erick

art erick