change 4-th line
Merge branch 'maksim' into integration

Conflicts:
	main.c