Merge branch 'master' of https://github.com/crononauta/tally-ho
Merge branch 'master' of https://github.com/crononauta/tally-ho
fixed division with zero in export results
Merge branch 'master' of https://github.com/crononauta/tally-ho
Added modify staff permissions in import_staff_list
Merge pull request #25 from ewokcillo/master

 Fixed division with zero in export results
Removes ballot combine and also removes exclude for ballot 54