Modificaciones parciales para incorporar cambios
Merge branch 'master' of https://github.com/Loksly/sici

Conflicts:
	app.js
	public/index.html
Merge branch 'master' of https://github.com/Loksly/sici

Conflicts:
	app.js
Merge branch 'master' of https://github.com/Loksly/sici
versión incompleta