Minor fixes
Merge branch 'master' of https://github.com/dreamcodergroup/dreamcodergroup.github.io into Zhaodong
Merge branch 'master' of https://github.com/dreamcodergroup/dreamcodergroup.github.io into Zhaodong

Conflicts:
	css/main.css
	faq.html
	work.html
conflicts
deleted
resolve conflicts
Compressed images
Merge branch 'Zhaodong'