вроде так?..
Merge branch 'master' of https://github.com/Arlenka/fizteh-java-2013