Added question controller specs.  Added question + discipline spec.
Merge branch 'master' of https://github.com/kevinweaver/weighted-democracy

Conflicts:
	config/routes.rb
	spec/controllers/questions_controller_spec.rb
	spec/models/discipline_spec.rb
fixed some routing
Merge branch 'master' of https://github.com/leequarella/weighted-democracy
Merge pull request #3 from kevinweaver/master

did a lot of great work