add 5-th line differently
Merge branch 'master' into maksim

Conflicts:
	main.c