commiting to pull kyle's recipe changes
merging with master
searches save to the db with relationships to user who searched and ingredients that were parameters of hte search and a property that is the id of the ingredients that were search
Merge pull request #69 from kamalama/recipes

searches save to db
searching for recipes by ingredient now works
fixed property object uploading the ingredients and db inventory's reference to ingredient.term
added horizontal layout to landing and search results page
a few ui tweaks
increased number of ingredients being pulled down
Merge pull request #70 from KyleW/kyle

Switched to a neat looking 2 column layout. Next step is to add breakpoints so it goes to one column for smaller widths
changed split of 2 columns to golden ratio, added mobile breakpoints, reorganized css.
simplified the use of styles and cleaned up the login page
more styling changes
restyled the recipe results page
Delivers an object to the app with the recipes by ingredient needed, and recipes by the number of ingredients in addition to the search query the user needs to make the recipe.  Still delivers an object of the top results as well for speed. It's currently making two calls to the API though.
syncing with master
apparently there are merge conflicts?
more styling, columns are working again
Merge pull request #71 from kamalama/searchQueries

Search queries
Merge branch 'master' into kyle