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