first commit
Merge branch 'gh-pages' of https://github.com/yanyin1986/yanyin1986.github.io into gh-pages

Conflicts:
	index.html
merge
modify _config.yml
Merge branch 'gh-pages'