git commit -a
git commit -a
Merge branch 'gh-pages' of https://github.com/lkun/lkun.github.com into gh-pages
git commit -a
Conflicts:
	个人经验/常用网址.md