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

Conflicts:
	SchoolPaperCommunicationForGD/.DS_Store

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