Accessible version changes (Course 7_con)
Merge remote-tracking branch 'origin/master'

Conflicts:
	courses_dev/css/course_specific/con_1_20.css
	courses_dev/html/con_1_20.html