Merge pull request #42 from abelousova/master

Shell, Белоусова Александра, 297 группа.
Merge branch 'master' of https://github.com/SergeyMelikov/fizteh-java-2013