correction 1
Merge branch 'gh-pages' of https://github.com/gongzhitaao/pcaweb into gh-pages

Conflicts:
	courses/comp1000/MyItLab/index.html
	courses/comp1000/final_exam/index.html
	courses/comp1000/friday_help_schedule/index.html
	courses/comp1000/index.html
	courses/comp1000/macintosh/index.html
	courses/comp1000/schedule/index.html
	courses/comp1000/syllabus/index.html
	courses/comp1003/index.html
	courses/comp1003/syllabus/index.html
	courses/comp1@@0/index.html
	courses/comp1@@0/schedule/index.html
	courses/comp1@@0/test_info/index.html
	courses/comp2000/index.html
	courses/comp2000/syllabus/index.html
	courses/comp3010/index.html
	courses/comp3010/syllabus/index.html
	courses/comp3013/index.html
	courses/comp3013/syllabus/index.html
	courses/comp5000/index.html
	courses/comp5000/syllabus/index.html
	courses/index.html
	index.html
	k12/compcamp/gallary/index.html
	k12/compcamp/history/index.html
	k12/compcamp/index.html
	k12/compcamp/people/index.html
	k12/index.html
	k12/robocamp/clothing/index.html
	k12/robocamp/gallary/index.html
	k12/robocamp/history/index.html
	k12/robocamp/index.html
	k12/robocamp/people/index.html
	k12/robocamp/tutorial/index.html