saving my place and heading home
Merge pull request #31 from gopher-snakes-2013/heroku-deploy

Heroku deploy
flattend the design with color changes and tweaked buttons to allow for Capybara tests.  All but 8 pass--due to ambiguity from placeholder forms
Merge branch 'master' into new_ui_theme

Conflicts:
	app/views/fridges/show.html.erb
fix recipe queries show bug w back button jquery mobile, add error messages to recipe search
Merge pull request #32 from gopher-snakes-2013/fix-recipe-bugs

fix recipe queries show bug w back button jquery mobile, add error messa...
updated themes for views: Recipies,Recipe_queries, Grocery_lists, and Fridges
all but one test passes.  All known views have been styled.  Need to take a closer look at javascript for swipe events
Merge branch 'master' into new_ui_theme

Conflicts:
	app/views/recipe_queries/index.html.erb
Merge pull request #33 from gopher-snakes-2013/new_ui_theme

New ui theme
Change Add Friend button from Sign Up to Add Fridge Friend, fixed feature tests with change'
Update tests to account for new Add Fridge Friend button
Update see friends of fridge test to account for new Add Fridge Friend button
Update user can create fridge item test to account for new Add Fridge Friend button
Merge pull request #34 from gopher-snakes-2013/change-add-friend-button

Change add friend button
moved 'Find Recipes' button from the sliding panel to the main toolbar.  Also updated Gemfile to default to ruby 2.0.0
add feature: user can remove self from shared fridge
all pre-existing tests passing
add #remove_user fridge controller test
add recipes_user join table, add recipes to fridge show view, add side panel to recipe queries index