Organização de resources
Merge branch 'master' of https://github.com/robertojunior/argos

Conflicts:
	html/popup.html