ignore those user state files?
Merge branch 'master' into canzhiye

Conflicts:

TextPlay/TextPlay.xcodeproj/project.xcworkspace/xcuserdata/canzhiye.xcus
erdatad/UserInterfaceState.xcuserstate
	TextPlay/TextPlay/ViewController.m