Hopefully fixed everything.
Merge branch 'master' of https://github.com/EricEidel/NodeJS_Carpool_Project

Conflicts:
	.gitignore
	app.js
	node_modules/passport/node_modules/pause/package.json
	routes/index.js
	routes/user.js
	views/index.html