Merge branch 'master' of https://github.com/kotick/sed1

Conflicts:
	lab1_max_monty.cpp