Merge pull request #1 from unclelarrysvan/master

Steve & Jorge's 1/9 Changes
updated to rails 3.2.11
added thin
Merge branch 'master' of https://github.com/leequarella/weighted-democracy

Conflicts:
	Gemfile.lock