Merge remote-tracking branch 'origin/Recipes' into testing-db-2

Conflicts:
	app/views/users/show.html.erb
- Added Modal Forms for Adding Foods and Recipes

- Clicking on the “add” buttons now displays a modal form.
   - No functionality, just the UI
- No backend stuff yet, just HTML CSS, and some link_to/rendering
- Add food setup

- Adding a food now sorta works. For some reason none of the form
fields are sending for creation, only the user_id associated with a
food is passing, so the food crated is blank.
- Renamed foods controller to food_items_controller
- schema had table for “foods” and “food_items”. Deleted Foods.
- Adding Food completed

- User can now manually add food items.
- food.html.erb now under food_items folder instead of users.
- routes changed to reflect this
- navbar foods link changed to reflect this
- users controller no longer has “food” def
- FoodItemsController update function created
- FoodItemsController food_item_from_params function created
- FoodItemsController new/food functions created, they do the same
thing but for some reason loves calling the food function.
-Expiration date badge added to Food list

- Show food lists display the expiration date. Still have to reformat.
Merge branch 'master' into testing-db-2

- merging master into working branch, conflicts in user.rb and
_food_item.html
Fixed some merging issues

Had to change some food item controller stuff.
- FoodItemsController now inherits from the application controller.
(Error occurred with Usercontroller::User)
- Expiration Dates are now Color Coded

- Expiration dates are now color coded based on how close the current
date is from the expiration date.
Updated Food Expiration Date Display

- Expiration dates are color coded depending on how quickly food will
expire.
- Foods with less than a month till expiration display as “x days
left!” instead of the date time
Quick change to expiration date display

Added another condition for foods with 30 days or more till expiration
User Page now has expiration updates

- User page now shows expiration dates with color codes
- Added Ingredients List for Add Recipe

- Add recipe form now has a list of the users food, still need to add
an option to create a custom food as an ingredient.

- Recipe page is no longer is users. Now in Recipes. Controller/Routes
updated to reflect that.

- Stylesheet updated
- Updated Add Recipe

- Added some javascript to handle selection of food ingredients. If
there is a way to pass a JS variable to @recipes.ingredients that would
own.
changed expiration text from bold to normal
Merge branch 'master' into testing-db-2

- Lots of conflicts, i used some of each branches changes.
- Added Ingredient Units Field on Add Recipe

- Added field for when an ingredient is selected, asks user how much of
the selected item is needed for the recipe.
- some css changes
- Dealt with another conflict from previous merge.