Vlad/Sudhir

Did some more work on the training stuff
Merge branch 'master' of https://github.com/sudhirj/training
MY CHANGES RULE
fixed all conflicts. my changes chosen