Fixed delete functions for questions and answers.
Fixed merge conflict in answers/show.html.erb