Removed merge clash code con_1_10
Merge branch 'master' of https://github.com/rhastings-epigeum/Statistics