menu mecanico
Merge remote-tracking branch 'origin/master'

Conflicts:
	usuarios/Menu.php