Add all
Merge branch 'hi_man' of https://github.com/AmeliePeng/code into hi_man

Conflicts:

FitGuider/FitGuider.xcodeproj/project.xcworkspace/xcuserdata/aaronyang.x
cuserdatad/UserInterfaceState.xcuserstate