Merge pull request #17 from fleur/master

added wireframe pdf, hardcoded /api/dish and /api/dishes GET metho...
added config.js for bookshelf, knex, and sqlite db
Merge pull request #18 from BrandonMcNary/master

added config.js for bookshelf, knex, and sqlite db
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...