project文件冲突
project
Merge branch 'master' of https://github.com/liuzhencai/QXH_20140524_XY

Conflicts:
	QXH.xcodeproj/project.pbxproj
	QXH/AppDelegate.m