Merge remote-tracking branch 'origin/master'

Conflicts:
	src/UnitTest.java
Merge branch 'master' of https://github.com/burkun/KDDTestForJava.git