Retrieving version 1.3.1
Merge branch 'master' of https://github.com/zhihaoli/QuizmTeach

Conflicts:
	Quizm Teach.xcodeproj/project.xcworkspace/xcshareddata/Quizm
Teach.xccheckout
Attempting to retrieve 1.3.1