Merge branch 'OldSolution'
Merge branch 'OldSolution'
some fixes
Merge branch 'master' of https://github.com/abogushevsky/Training