edit file4
Merge branch 'master' into newbr
new changes
r1>>file3
Merge branch 'master' of https://github.com/b10n1k/practice

Conflicts:
	file3.md
add travis conf
fil33 blnlnlnk
Merge branch 'master' of https://github.com/b10n1k/practice

Conflicts:
	file3.md
	file4.md