:) Timer in server is done
Merge branch 'Diego' of github.com:RenderTeam/focus

Conflicts:
	package.json
	public/js/app.min.js