fixing merge
callback works, gotta see if json goes through callback
Merge branch 'master' of https://github.com/shelawang/food-picker

Conflicts:
	.DS_Store
	static/scripts/logic.js