merge braches
Merge branch 'master' of https://github.com/lialin/lialin.github.io

Conflicts:
	index.html

solve the conflict