HiMan

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

Conflicts:
	FitGuider/FitGuider/FitGuiderViewController.h
1