still broken routes for adding friends on new.html.haml and new_friend.html.haml and added method to friendship.rb
Luke's edits and resolved conflict in application layout