Merge branch 'master' of https://github.com/yaodd/SchoolPaperCommunication

Conflicts:
	SchoolPaperCommunicationForGD.xcodeproj/project.pbxproj
	SchoolPaperCommunicationForGD/Net/.DS_Store

Signed-off-by: Chilok <125435134@qq.com>
Merge branch 'master' of https://github.com/yaodd/SchoolPaperCommunication

Conflicts:
	SchoolPaperCommunicationForGD.xcodeproj/project.pbxproj

Signed-off-by: Chilok <125435134@qq.com>