menu de planetas
Merge branch 'master' into menu-planetas

Conflicts:
	src/resource.js
Merge pull request #105 from startupcursos/menu-planetas

menu de planetas