more controller planning
Merge branch 'master' of github.com:maxkohl88/all-my-circuits

Conflicts:
	app/controllers/convos_controller.rb