Organização de resources
Merge pull request #7 from robertojunior/master

Organização de resources
Issue#4: Mostrar a instancia que está sempre
Merge branch 'master' of https://github.com/robertojunior/argos

Conflicts:
	html/popup.html
whitespaces
Merge pull request #8 from woolong/master

Issue#4
Rename jquery.min.js to jquery-1.10.2.min.js
Rename jquery-1.10.2.min.js to jquery.min.js

rename anterior feito no repositorio errado
Merge remote-tracking branch 'jorgepgjr/master'

Conflicts:
	popup.html
	script.js