Added stuff
Merge branch 'master' of github.com:ryandao/KWIC

Conflicts:
	src/CLI.java