Initial commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	routes/index.js
	routes/user.js
	views/index.jade
	views/layout.jade