Changes
Merge branch 'master' of https://github.com/surkova-fivt/fizteh-java-2014