master commit
master commit
изменения в rebase
rebase commit
ignore file added
Merge remote-tracking branch 'origin/rebase' into rebase

Conflicts:
	file.txt