jugando con app.js
Merge branch 'master' of github.com:jgab-net/siplik-frontend

Conflicts:
	app/index.html