CAT
Fix language style
Update voting rules
Merge pull request #3 from RaZer/master

Update voting rules