version 3b
Merge branch 'master' of https://github.com/Trudko/gitrebase

Conflicts:
	file.txt