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

Conflicts:
	app/models/user.rb
Add apostrophes to valid name regex
Fix errors in factory and user spec
Refactor tests

- Rename 'sign_in' helper to 'log_in_as'
- also adds save_and_open_page methods for debugging
Fix User Pages Spec, food_item spec

-Adds recipes factory and some tests
-Fixes incorrect matchers
-Invalid and valid information tests still not working
Rename 'foods_controller' to 'food_items_controllers'
Remove name length validation
Recipe [model] validates presence of ingredients

-instead of notes
food item displays expiration date

-instead of description
Rename sessions form partial to '_login_form'
Change button id and add css class name box
Display recipe ingredients

-instead of directions
refactor food_item partials

-partial for listing user's food items
-partial for partial for view food item area
Fix displaying recipes on user show page
Changes for heroku
Undelete gemfile.lock
Update food_item and recipe factories to generate random text
Merge branch 'master' into testing-db-2

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