Pedras
closes #2
Merge branch 'master' into 2-criar-pedras

Conflicts:
	src/layers/GameLayer.js
	src/resource.js
Merge branch '2-criar-pedras'