ddd

jhgkj
SDf

FE
delete
ADD

ADD
Merge branch '64'
dd
Merge branch '64'

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
fff
dfd
amelie
Merge branch 'mine'
Merge branch 'master' into mine

Conflicts:

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