fase ok
Merge branch 'master' into level8

Conflicts:
	src/layers/GameLayer.js
Merge pull request #89 from startupcursos/level8

fase ok