Somewhat premature solutions for 2_4 and 2_5
Merge branch 'master' of https://github.com/volchek/cpp_craft_0314