Signed-off-by: xuchong <xuchong19890307@163.com>
Merge branch 'master' of https://github.com/JustRain/AutoTest.git

Conflicts:
	src/Test/Test.java