去掉没必要提交的文件，去掉单元测试库
合并master分支
Merge branch 'master' of github.com:iBcker/Maotachi

Conflicts:
	Maotachi.xcodeproj/project.xcworkspace/xcuserdata/lc.xcuserdatad/UserInterfaceState.xcuserstate