Merge remote-tracking branch 'origin/master' into maksim
add 5-th line
Merge branch 'master' into maksim

Conflicts:
	main.c
Added somefile
add another file