modify 1(3)
Merge branch 'master' of github.com:GeffreySun/DeepJUC

Conflicts:
	test/mytest/1.txt