All calc
Merge branch 'master' of github.com:shlopack/cursovaya

Conflicts:
	template/4_22.py