Merge branch 'master' of https://github.com/rhastings-epigeum/Statistics

Conflicts:
	config.codekit
commit codekit.config file