Upload to Mac.
Merge branch 'master' of https://github.com/BMStoddard/course_info

Conflicts:
	subject/arts/dance/courses.html
	subject/arts/music-band/courses.html
	subject/arts/music-orchestra/courses.html
	subject/arts/music-vocal/courses.html
	subject/arts/theatrearts/courses.html
	subject/arts/visualarts/courses.html
	subject/ascs/courses.html
	subject/cte/agriculturaled/courses.html
	subject/cte/aoit/courses.html
	subject/healthfulliving/courses.html
	subject/mathematics/courses.html
	subject/science/courses.html
	subject/socialstudies/courses.html