Update
Update
Update
fixing merge conflicts

Conflicts:
	grubQuest-node/app.js
	grubQuest-node/assets/js/parse.js
	grubQuest-node/views/results.ejs
app.js merge conflicts

Conflicts:
	grubQuest-node/assets/js/parse.js
	grubQuest-node/views/results.ejs