Add ballot + fix couple of bugs
Rename README.md to README.bak.md
Merge remote-tracking branch 'origin/master'