Weeks 2-4 corrections
Merge branch 'master' of https://github.com/gost402/cpp_craft_0314
Weeks 2-4 corrections'