Revert commir

Merge branch 'origin/master'

Conflicts:
	README.md
	package.json
	public/stylesheets/style.css
	routes/index.js
	routes/user.js
	server.js
	views/index.jade
	views/layout.jade (reverted from commit d9b43066601aca009918808b6587dd4f0d4440eb)