Attempt to get the gemifile.lock to stop asking to be committed
User can add favorites on main search page
User can add favorites on filtered search page
Merge branch 'master' into TLR-favorite-recipes

Conflicts:
	app/views/recipes/index.html.erb
	app/views/welcome/index.html.erb

Extracted add and favorite code into the brand new partial that
appeared.  Yay for less code duplication!
Merge pull request #32 from tararoys/TLR-favorite-recipes

Tlr favorite recipes
integrating tara's favorites branch
updated recipe list partial to include tara's fav functionality