cliente
Merge branch 'master' of https://github.com/emiliano8511/dsi

Conflicts:
	interface/html/index.html
	interface/scripts/menu.js