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
a few styling changes on the ingredients page
Merge branch 'master' into kyle
Merge branch 'master' into kyle
debugging passport.js
Merge pull request #41 from kamalama/authentication

debugging passport.js
really.. an array of objects?
Merge pull request #42 from kamalama/authentication

really.. an array of objects?
taking db queries out
Merge pull request #43 from kamalama/authentication

taking db queries out
replaced fb login with google login
some testing stuff and a sign in with google button
resolving merge conflicts
added dbusercontrols, nothing done yet
Merge branch 'master' into dbfunctions
dbusercontrols.js
Merge pull request #44 from KyleW/kyle

Added sign in with google button and some jasmine testing stuff that's not quite done.