save before merge
Merge branch 'master' of https://github.com/ustcscgy/blog_source

Conflicts:
	source/wiki/chemistry-software.markdown
	source/wiki/linux.markdown