merge conflict
merge commit new
Merge branch 'master' of https://github.com/vuphuctho/CS3246-Project1

Conflicts:
	index-directory/_0.fdt
	index-directory/_0.fdx
	index-directory/_0.fnm
	index-directory/_0.frq
	index-directory/_0.nrm
	index-directory/_0.prx
	index-directory/_0.tii
	index-directory/_0.tis
	index-directory/segments_1
	src/Main.java
merge 3