Initial merge of voteCalc.js