back end code for github auth via omniauth gem :whale2:
cleaned up excess model with rake db:rollback, and redid schema
:dolphin:
successful implementation of devise and omniauth/github :octopus:
minor mods, added authenticate_user! to before area :turtle:
Removed many extraneous files and code per Eliza's comments.
Deleted more unnecessary stuff
Migrated db to remove provider column and add token column
Committing migration files :snake::snake::snake:
:snake:Merge remote-tracking branch 'upstream/master':snake:

Conflicts:
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
	db/schema.rb
made some changes :dragon_face:

Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile.lock
	app/models/user.rb
	config/routes.rb
	db/schema.rb
made more changes :banana:

Merge branch 'master' of https://github.com/adamthede/squmblr

Conflicts:
	config/routes.rb
	db/schema.rb
merged with Eliza's most up-to-date branch :hear_no_evil:
committing before merge :mushroom:
Merge branch 'master' of https://github.com/adamthede/squmblr
:space_invader::space_invader:Github login, all tests passing:space_invader::space_invader:
final mods for proper omniauth implementation (removed/cleaned code)
:smirk:
Merge branch 'master' of github.com:adamthede/squmblr into adamthede-master

* 'master' of github.com:adamthede/squmblr:
  final mods for proper omniauth implementation (removed/cleaned code) :smirk:
  :space_invader::space_invader:Github login, all tests passing:space_invader::space_invader:
  committing before merge :mushroom:
  merged with Eliza's most up-to-date branch :hear_no_evil:
  Committing migration files :snake::snake::snake:
  Migrated db to remove provider column and add token column
  Deleted more unnecessary stuff
  Removed many extraneous files and code per Eliza's comments.
  minor mods, added authenticate_user! to before area :turtle:
  successful implementation of devise and omniauth/github :octopus:
  cleaned up excess model with rake db:rollback, and redid schema :dolphin:
  back end code for github auth via omniauth gem :whale2:

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	config/routes.rb
Merge branch 'adamthede-master'

* adamthede-master:
  final mods for proper omniauth implementation (removed/cleaned code) :smirk:
  :space_invader::space_invader:Github login, all tests passing:space_invader::space_invader:
  committing before merge :mushroom:
  merged with Eliza's most up-to-date branch :hear_no_evil:
  Committing migration files :snake::snake::snake:
  Migrated db to remove provider column and add token column
  Deleted more unnecessary stuff
  Removed many extraneous files and code per Eliza's comments.
  minor mods, added authenticate_user! to before area :turtle:
  successful implementation of devise and omniauth/github :octopus:
  cleaned up excess model with rake db:rollback, and redid schema :dolphin:
  back end code for github auth via omniauth gem :whale2: