解决冲突
Merge branch 'master' of https://StarLee@github.com/StarLee/imslope.git

Conflicts:
	src/main/java/cn/edu/rg/mapred/UsersMapper.java