lab3 + annat
Merged master fixed conflict.
Merge remote-tracking branch 'origin/master'

Conflicts:
	lab2/monetary.cc