modified:   test
Merge branch 'master' of https://github.com/sutrix/testgit
	modified:   testconfig