Update
Merge branch 'master' of https://github.com/d-sepulveda/update

Conflicts:
	chrome.sh
	update_manual.sh