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
Moved neo4j DB to a new file for modularity and general prettyness
Merge pull request #7 from kamalama/authentication

Moved neo4j DB to a new file for modularity and general prettyness
Basic setup of css and index.html, but without angular or stylus
shell of index.html is there. Needs stylus, angular, breaking into templates.
resolving merge conflicts
resolving merge conflicts
Merge branch 'master' into frontend
Merge pull request #9 from KyleW/frontend

Shell of index.html is there with responsive grid. Needs stylus, angular.
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