working on github oauth
resolved merge conflict in application_controller
fixing merge conflict
resolved merge conflicts in application_conroller and gemfile.lock