cleared recipes show.html.erb so it can be used for the user viewing a recipe
edited controllers for readability
merge conlflict