a few styling changes on the ingredients page
Merge branch 'master' into kyle
Merge pull request #36 from kamalama/authentication

Authentication
Merge branch 'master' into kyle
separated batching functions from root db stuff
Merge pull request #37 from kamalama/authentication

missed a merge conflict on package.json
Merge pull request #38 from kamalama/authentication

fixed reference to obj in strategy declaration for fb
Merge pull request #39 from kamalama/authentication

fixed reference to user in find or create function
hooray. batches ingredients into transactions of 100 at a time and imports them all together. works. finally
merge conflict
Merge pull request #40 from lazaruslarue/updateDBinterface

can now initialize the db with a bunch of properly labeled ingredients\
Merge pull request #41 from kamalama/authentication

debugging passport.js
Merge pull request #42 from kamalama/authentication

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

taking db queries out
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.