for Greg's review
Merge branch 'master' of github.com:mipelamo/FoodTrends2014

Updating branch

 pnes starting with '#' will be ignored, and an empty message aborts