updated package.json to reflect correct entry file
updated package.json to reflect correct entry file
tinkering with middleware to connect yummly api to server
minor changes
Merge branch 'master' of https://github.com/nourishme/menuapp
merged new master into my changes
calls yummly api and displays result to host.com/apitest
working on auth things
merging Jesse's commits for yummly API, fixing merge conflicts
second try at merging jesse's yummly api stuff
Merge pull request #11 from kamalama/jesseMaster

merging jesse's yummly api changes
Merge branch 'master' into frontend