tianjiacontroller
hjhj
Merge branch 'pr/2'

Conflicts:
	MY_Magazine.xcodeproj/project.pbxproj
	MY_Magazine/CCAppDelegate.m