Added Shoulda and dependencies with discipline and question
Merge branch 'master' of https://github.com/leequarella/weighted-democracy

Conflicts:
	Gemfile.lock
Merge pull request #2 from unclelarrysvan/master

Added Shoulda