temp Branch Version

temp one
jing New Version

New Stable Version
Merge branch 'tmpBranch' into NewJingWZ

Conflicts:
	CourseQ.xcodeproj/project.pbxproj

CourseQ.xcodeproj/project.xcworkspace/xcuserdata/feeval.xcuserdatad/User
InterfaceState.xcuserstate
	CourseQ/.DS_Store