tried working on register/login
resolved conflicts

Conflicts:
	grubQuest-node/app.js
Merge branch 'nicole'
resolving conflicts

Conflicts:
	grubQuest-node/app.js
	grubQuest-node/package.json