AlinhandoMarteMusica-Fabiano
Merge branch 'master' into AlinhandoMarteMusica-Fabiano

Conflicts:
	src/layers/GameLayer.js
Merge pull request #80 from startupcursos/AlinhandoMarteMusica-Fabiano

AlinhandoMarteMusica-Fabiano