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

Conflicts:

FitGuider/FitGuider.xcodeproj/project.xcworkspace/xcuserdata/tribbianize
ro.xcuserdatad/UserInterfaceState.xcuserstate
	FitGuider/FitGuider/FitGuiderViewController.h
	FitGuider/FitGuider/FitGuiderViewController.m