merging local changes
Merge branch 'master' of https://github.com/sbasu31/fastsearch

Conflicts:
	src/com/test/TestRange.java