test branch
finish testing1 branch
Merge branch 'testing1'

Conflicts:
	temp1.txt
remove unused file maseter
clear content master