HiMan

int a
fff
dfd
amelie
Merge branch 'master' of https://github.com/AmeliePeng/code

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
1
1

1
2

2
2

2
Merge branch 'hi_man'

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

Conflicts:

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

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