branch test
and simple
ttt
conflict fixed
t2 test
t3 test
Merge branch 'feature1'

Conflicts:
	LISENCE.txt