Merge branch 'master' into nicole
res before render
changed the file structure of the project
fixed a conflict

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