add3 repo
after merger

Merge branch 'master' of https://github.com/tfx1x/testing

Conflicts:
	file1