a few styling changes on the ingredients page
Merge branch 'master' into kyle
Merge branch 'master' into kyle
some testing stuff and a sign in with google button
resolving merge conflicts
Merge pull request #44 from KyleW/kyle

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