Merge branch 'master' into 64

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
Merge branch 'master' into hi_man

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
Change
HiMan

int a
hhh
Merge branch 'master' of https://github.com/AmeliePeng/code

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
1
1

1
2

2
ddd
Merge branch 'mine'

Conflicts:

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

2
deleteall
Merge branch 'hi_man'

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
	FitGuider/FitGuider/FitGuiderViewController.m
Merge branch 'master' of https://github.com/AmeliePeng/code

Conflicts:

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

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.m