added instant messaging to user show page
fixed merge conflicts in users_cont, gemfile.lock & routes.rb