first commit
create user model using devise
migrated the database for the user table
Merge pull request #1 from maxkohl88/DeviseUserModel

Devise user model
sketch user controller
sketch convo controller
installed the dotenv gem and added Github client/secret keys to .env file
add github-speciic attributes onto user model
Merge branch 'controller_sketching' of github.com:maxkohl88/all-my-circuits into omniauth-github

Conflicts:
	db/schema.rb
a user can signup/login using their Github account
Merge pull request #2 from maxkohl88/omniauth-github

Omniauth github
basic styling progress
more controller planning
Added hstore columns to User model
Merge branch 'master' of github.com:maxkohl88/all-my-circuits

Conflicts:
	app/controllers/convos_controller.rb
merge master onto survey branch
Merge branch 'survey' of github.com:maxkohl88/all-my-circuits into survey

Conflicts:
	config/routes.rb
	db/schema.rb
remove hstore, put attr on user
populate User model with attributes needed for wizard completion
user can go through each step of the wizard successfully