init
Merge branch 'master' of github.com:yujing5b5d/HelloLucene

Conflicts:
	.gitignore