added wireframe pdf, added hardcoded /api/dish and /api/dishes GET methods
Merge pull request #17 from fleur/master

added wireframe pdf, hardcoded /api/dish and /api/dishes GET metho...
Merge pull request #18 from BrandonMcNary/master

added config.js for bookshelf, knex, and sqlite db
a few lint errors, disablint /api/thing test
trying to set up continuous integration with travisCI
added email notification on build status change
added npm install -g grunt-cli as before_install task
some syntax errors fixed
make the default grunt tasks run all the way through
added all email addresses
Merge branch 'fleur-travisCI'
merging in en/en so the travis CI pull request will work.  hopefully.  the package.json file had changes that hadn't been merged yet
Merge pull request #21 from fleur/master

i think i finally have it
i think we have to do a push request to get travisCI started.  i added a newline
added bookshelf models & controllers dirs and dish & dishes models and controllers
Merge pull request #24 from fleur/feat/mysql

added bookshelf models & controllers dirs and dish & dishes models and c...
Added and linked views, controllers, and factories. Updated navbar with basic structure.
Merge pull request #25 from shseu/master

Added and linked views, controllers, and factories. Updated navbar with ...
modified /api/dish handler GET to get from database and POST to save to database
modified /api/dish handler GET to get from database and POST to save to database