Cambios mayores
Merge branch 'master' of github.com

Conflicts:
	settings/menu.sh