my first commit
Merge branch 'slave' of https://github.com/tomasmano/A7B36ASS-labs

Conflicts:
	final/kwic-shared/src/main/java/cz/cvut/ass/kwicshared/Kwic.java
oprava uzivatelskeho vstupu