First try
Merge branch 'master' of github.com:luizguilhermesj/NOOB

Conflicts:
	chrome-extension/config.html