ww

www
Merge branch 'master' of https://github.com/niufuwei/BabyWith

Conflicts:
	BabyWith/BabyWith.xcodeproj/project.pbxproj
	BabyWith/UI/SettingsViewController.m
Merge branch 'master' of https://github.com/niufuwei/BabyWith