Using Kimodo to get images
Merge branch 'master' of github.com:sampepose/foodinder

Conflicts:
	server/app.js
	server/food_images.js