added kwic functionality
Merge branch 'master' of https://github.com/romibi/HSR_Prog3

Conflicts:
	.gitignore
Switched from Word-Sol to word