Merge pull request #1 from dmitryvodop/lab3-development

Lab3 development
Merge remote-tracking branch 'upstream/master'
added CMakeLists.txt
Merge branch 'lab4-integration' of https://github.com/dmitryvodop/devtools-course into lab4-integration
some changes
Add CMakeLists.txt and simple CTestTests.txt
Using Google Style
 Lines should be <= 80 characters long
 Lines should be <= 80 characters long
Merge branch 'lab4' of https://github.com/ZhbanovaAnna/devtools-course into lab4

Conflicts:
	code/anna-zhbanova/src/Triangle.cpp
deleted extra space
замечания по тестированию на Travis
Исправила замечания по Google style
Google style
Goolgle style2
Google style2
deleted macro and comparing floating point with == or !=
заменила (int) на static_cast<int>
Added CMake script
exception