frist commit
Merge branch 'master' of https://github.com/jiadi/tutorial

Conflicts:
	sample.txt
commit 记录索引的状态
Merge branch 'master' of https://github.com/jiadi/tutorial

Conflicts:
	sample.txt