修改教程1包名路径
Merge branch 'master' of https://github.com/yuanmomo/MyBatisTutorial.git

Conflicts:
	src/main/resources/mybatis-config.xml
	src/test/java/net/yuanmomo/mybatis/tutorial1/Test1.java