se agrega timer
Merge branch 'master' of https://github.com/Wirwing/ProyectoCVE

Conflicts:
	bower.json
	public/js/controllers/chat.js
	templates/scripts.html
resolucion de conflictos