message
revert to c6c09fe
reset
redo
Merge branch 'master' of https://github.com/lifesurfeit/sscheduler

Conflicts:
	app.js
	bin/www
	package.json
	public/javascripts/global.js
	public/stylesheets/style.css
	routes/index.js
	routes/users.js
	views/index.jade
revert to 5ec30048