black
branch test
master test
Merge branch 'dev'

Conflicts:
	LISENCE.txt
init readme
111
222
333
444
555 dev
666 dev
777
Merge branch 'dev'

Conflicts:
	readme.txt