edit
Merge remote-tracking branch 'origin/master'
ignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	CourseProject/lucene_index/_3s.fdt
	CourseProject/lucene_index/_3s.fnm
	CourseProject/lucene_index/_40.fdt
	CourseProject/lucene_index/_40.fdx
	CourseProject/lucene_index/_40.fnm
	CourseProject/lucene_index/_40.nrm
	CourseProject/lucene_index/_40.prx
	CourseProject/lucene_index/_6s.fdt
	CourseProject/lucene_index/_6s.fnm
	CourseProject/lucene_index/segments.gen
	CourseProject/lucene_index/segments_1y
	CourseProject/lucene_index/segments_22
	CourseProject/lucene_index/segments_3g
Merge remote-tracking branch 'origin/master'

Conflicts:
	CourseProject/lucene_index/_3s.fdt
	CourseProject/lucene_index/_3s.fnm
	CourseProject/lucene_index/_40.fdt
	CourseProject/lucene_index/_40.fdx
	CourseProject/lucene_index/_40.fnm
	CourseProject/lucene_index/_40.nrm
	CourseProject/lucene_index/_40.prx
	CourseProject/lucene_index/_6s.fdt
	CourseProject/lucene_index/_6s.fnm
	CourseProject/lucene_index/segments_1y
	CourseProject/lucene_index/segments_22
	CourseProject/lucene_index/segments_3g