t
Merge branch 'master' of github.com:KevinSky/practice

Conflicts:
	mybatis/src/main/java/kevin/practice/mybatis/service/NewsService.java
	mybatis/src/main/java/kevin/practive/mybatis/dao/factory/MapperFactory.java
	mybatis/src/test/java/kevin/practice/mybatis/NewsTest.java