Automatical message by push script
Merge branch 'master' of github.com:genggc/genggc.github.com

Conflicts:
	aboutme.html
	activities.html
	archive.html
	cn/aboutme.html
	cn/activities.html
	cn/archive.html
	cn/education.html
	cn/honors.html
	cn/index.html
	cn/publication.html
	cn/research.html
	education.html
	honors.html
	index.html
	publication.html
	research.html
Automatical message by push script