Merge branch 'master' into mine
fddd
Merge branch 'master' into mine

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.m
dddd
fdfd
Merge branch 'mine'

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

Conflicts:

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