Fixed clash
Fixed clash #2
Merge branch 'master' of https://github.com/rhastings-epigeum/Statistics

Conflicts:
	courses_dev/html/scr_1_50.html
	courses_dev/js/global/globalFunctions.min.js