some chenged

Splitted Into 2 files
Some corrected
Merge branch 'gena' of https://github.com/Surzhko/training into gena