conflict
Merge branch 'master' of git@github.com:caixueqing/MybatisSpring.git

Conflicts:
	src/com/mytest/java/ArrayListTest.java
Merge branch 'master' of git@github.com:caixueqing/MybatisSpring.git

Conflicts:
	src/com/mytest/java/ArrayListTest.java