Merge branch 'master' of https://github.com/marozau/cpp_craft_0314
Merge branch 'master' of https://github.com/marozau/cpp_craft_0314

Conflicts:
	solutions/jenya_paulovets/1/CMakeLists.txt
	solutions/jenya_paulovets/1/_gcc_gen.sh
the second homework
Merge branch 'master' of https://github.com/marozau/cpp_craft_0314
the second homework
the second homework
the second homework
the second homework
the second homework
Merge branch 'master' of https://github.com/marozau/cpp_craft_0314
revised the second homework
changes
corrected tasks 2
Merge branch 'master' of https://github.com/marozau/cpp_craft_0314
corrected tasks 2
Merge pull request #135 from paulovets/master

corrected tasks 2