found missing token
fixing up conflicts
Merge branch 'master' of github.com:mikestone14/RecipeMe