add file
fix
Merge branch 'master' of https://github.com/wangdehuai/JSD

Conflicts:
	JSD.xcodeproj/project.pbxproj

JSD.xcodeproj/project.xcworkspace/xcuserdata/wangdehuai.xcuserdatad/User
InterfaceState.xcuserstate
	JSD/PrefixHeader.pch
	JSD/RootViewController.h
	JSD/RootViewController.m