test travis
add junit and task 4
Merge branch 'master' of github.com:v1ctor/fizteh-java-2014
Merge pull request #120 from v1ctor/master

add task 4