hi tian
Merge branch 'master' of https://github.com/tiansjin/eatHarmony-iOS

Conflicts:
	eatHarmony/eatHarmony/Base.lproj/Main.storyboard

blah