Cleanup
Merge remote-tracking branch 'origin/master'

Conflicts:
	ruby_game.rb
Adding answer count to quiz view
Merge remote-tracking branch 'origin/master'