Merge branch 'master' of https://github.com/tomkennedy22/DB-GUI-Fall2014

Conflicts:
	PantryQuest_2014-10-23.sql
	recipes.csv
Merge branch 'master' of https://github.com/tomkennedy22/DB-GUI-Fall2014

Conflicts:
	js/results.js