aaa
Merge branch 'master' of https://github.com/jeasonyoung/examw-test

Conflicts:
	src/test/java/com/examw/test/junit/domain/ShiTi.java
	src/test/java/com/examw/test/junittest/MainTest.java