sh

sh
maojm
Merge branch 'master' of https://github.com/ysqvision/CollegeTrade

Conflicts:

CollegeTrade.xcodeproj/project.xcworkspace/xcuserdata/maojm.xcuserdatad/
UserInterfaceState.xcuserstate