Calc fixed
Change
Merge branch 'master' of https://github.com/yanina-anastasia/fizteh-java-2013