some changes
pull from my repo
Merge branch 'master' of https://github.com/PodoltsevaOlga/fizteh-java-2013