config
Merge branch 'master' of https://github.com/huyao15/iAngryGirl

Conflicts:
	AngryGirl.xcodeproj/project.pbxproj
	AngryGirl.xcodeproj/project.xcworkspace/xcuserdata/huyao.xcuserdatad/UserInterfaceState.xcuserstate
config