a few styling changes on the ingredients page
Merge branch 'master' into kyle
Merge branch 'master' into kyle
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.
Merge pull request #45 from lazaruslarue/dbfunctions

Dbfunctions
spacing
Merge branch 'master' into dbfunctions
pulling the login with google button and user queries
Merge pull request #46 from kamalama/authentication

Authentication
updated ignore file to take out shell_history
removing test code
authentication and writing user to the DB works
Merge pull request #47 from kamalama/authentication

Authentication (yay!)
not working. many late night updates