Routers
Merge branch 'master' of https://github.com/Azune/drunken-shame

Conflicts:
	Aplicacion/routers/router.js
	Aplicacion/server.js
	Aplicacion/web/javascript/main.js
	Aplicacion/web/templates/index.html