merging kyles pull request adding Added stylus and topcoat to index.html
checking kyle's push
pulling kyle's changes
checking Added routing and shells for helper functions for get ingredients, save ingredients, get search results and get recipe
Merge branch 'master' into dbfunctions
Merge pull request #57 from KyleW/kyle

Rough versions of all the pages in the MVP flow now exist and display sample data.
wired landing page and ingredients section of recipe search to server
so far so good, but waiting for the db and server functions to finish wiring it up
recipe upload works
GET YO DATA FOO
Merge pull request #58 from KyleW/kyle

a few cleanups for the demo
NO MERGE CONFLICTSWHOA
deleting txt file of recipe object
Merge pull request #59 from kamalama/recipes

Recipes
updated recipe so doesn't insert duplicated recipes
Merge pull request #60 from kamalama/authentication

updated recipe so doesn't insert duplicated recipes
a few styling changes
resolving merge conflicts
added matchNodeByPropertyValueAndLabel phrase.  updated ingredients.js to use dbinventory.getRecipeByIdString
checking on db query