Commit
Commit

Conflicts:
	public/js/templates/menu.html
	public/js/views/app.js
Resolviendo conflictos

app view