tester2
Merge branch 'master' of
https://github.com/magicboxhan/Patsnap_test_framework

Conflicts:
	test.txt