edit in master
Merge branch 'master' of https://github.com/newbinghi/mytest

Conflicts:
	testbr.txt
new big fix
small add
small merge fixes