closes #54
Merge branch 'master' into 54-inimigo-seguidor

Conflicts:
	src/resource.js
Merge pull request #67 from startupcursos/54-inimigo-seguidor

closes #54