commit from Sergey R.
Sergey R.
Merge remote-tracking branch 'origin/master' into russiyan_s

Conflicts:
	README.txt
	main.rb
commit
commit from my branch
merge
merge 2
merge 3 time