Merge branch 'master' of https://github.com/cbreckon/trailfoodmagic.git