for pull
Merge branch 'master' of github.com:shnellpavel/STP_labs

Conflicts:
	simple_division/simple_division.pro.user