fetching pull request with conflicts
hooked up food across modules
conflicts resolved
fixed conflicts
Merge pull request #22 from bchiatt/brian

Brian
Merge pull request #23 from bchiatt/food-chain

hooked up food across modules
Merge branch 'master' into brian