added voting by right name
voting part 2
Merge remote-tracking branch 'origin/julius'

Conflicts:
	config/routes.rb