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
add Main page
1
Merge branch 'master' into hi_man

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.m
2
add animation number

add animation number at the top of view
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
delete all
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
Add All
Merge branch 'hi_man'

Conflicts:

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