Merge branch 'nicole'
moved res.write above render
resolving conflicts

Conflicts:
	grubQuest-node/app.js
	grubQuest-node/package.json
Merge branch 'master' into nicole
res before render