added sample code from warden-github-rails gem
fix merge conflict in gemfile.lock