Second commit
Merge branch 'master' of https://github.com/PotapovaSofia/fizteh-java-2014