калькулятор
calculator project
Merge commit '673e125f38fd8b88e31e7349327756521feb2ea1'

Conflicts:
	Calculator