lab02
Merge remote-tracking branch 'origin/master'

Conflicts:
	lab02/laba2.cpp
	lab02/laba2.h