applying first level
okMerge branch 'master' of https://github.com/afituri/tally_results