found some errors of merging, very sorry =(
Merge branch 'master' of https://github.com/Xboctus/java-school-2014