Merge branch 'master' of
https://github.com/shanghaishule/website-of-huai.git

Conflicts:
	SRC/tpl/Home/lanrain/Huai_index.html
Merge branch 'master' of
https://github.com/shanghaishule/website-of-huai.git
Merge branch 'master' of
https://github.com/shanghaishule/website-of-huai.git

Conflicts:
	SRC/tpl/Home/lanrain/Huai_index.html