change
Merge branch 'master' of https://github.com/HanYaZhou1990/-SunFlower

Conflicts:
Sunflower/ViewControllers/EMBAMainViewController.h