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

Conflicts:
	js/action.js
	js/modal.js
	js/recipe.js
	js/results.js