Merge branch 'master' of http://195.19.32.74:2038/gkamenskih/lab_2_calculator

# Conflicts:
#	calculator.cpp
3 jobs for master
in 0 seconds, using 0 compute credits, and was queued for 0 seconds