have to commit to pull
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
clean up code for voteListViewController
Merge remote-tracking branch 'origin/master'
solve conflict