Reverted line normalization change
Fixed some issues found in w3 validator
Fixed merge issues
Merge branch 'master' of https://github.com/rhastings-epigeum/Statistics

Conflicts:
	courses_dev/html/acd_1_10.html
	courses_dev/html/acd_1_50.html
	courses_dev/html/acd_clo_quiz.html
	courses_dev/html/con_1_10.html