Merge branch 'master' into nicole
Merge branch 'master' into nicole
Merge branch 'master' into nicole
got the menu loop to work
Made progress on menu loop and details
Fixed merge conflict

Conflicts:
	grubQuest-node/site/views/details.ejs