KWIK updated
Merge branch 'master' of https://github.com/jasontbk/KWIC-KWAC-KWOC-.git

Conflicts:
	KIWC-KWAC-KWOC/src/Kwik.java