Merge branch 'master' into asdf
Merge branch 'mine'
aaa
Merge branch 'master' into mine

Conflicts:

FitGuider/FitGuider.xcodeproj/project.xcworkspace/xcuserdata/tribbianize
ro.xcuserdatad/UserInterfaceState.xcuserstate
	FitGuider/FitGuider/FitGuiderViewController.m
ddd
ddd
Merge branch 'mine'

Conflicts:

FitGuider/FitGuider.xcodeproj/project.xcworkspace/xcuserdata/tribbianize
ro.xcuserdatad/UserInterfaceState.xcuserstate
	FitGuider/FitGuider/FitGuiderViewController.m
deleteall
Merge branch 'master' of https://github.com/AmeliePeng/code

Conflicts:

FitGuider/FitGuider.xcodeproj/project.xcworkspace/xcuserdata/tribbianize
ro.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'master' of https://github.com/AmeliePeng/code