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
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
a few styling changes
resolving merge conflicts
checking on db query
added the beginning of a serach history, favorite ingredient, least favorite page
pulling search for ingredients
refactored server.js
Merge branch 'master' into postDemo
refactored server.js and routes.js
clearning up merge conflicts
refactored server.js and routes.js
moved auth routes from routes.js to auth.js. may need to be recombined with configure passport.
first go at saving search info
wired landing page and ingredients section
alsdf