Merging issue
Merging issue #2
Merging issue #3
Merge branch 'master' of https://github.com/rhastings-epigeum/Statistics

Conflicts:
	courses_dev/html/con_1_10.html