sketch user controller
sketch convo controller
Merge branch 'controller_sketching' of github.com:maxkohl88/all-my-circuits into omniauth-github

Conflicts:
	db/schema.rb