first commit .
Merge branch 'master' of https://github.com/longchao/longchao.github.io

Conflicts:
	index.html