add 34
ignore
ignore
Merge branch 'debug' of https://github.com/wesleydotyang/TestProject into debug

Conflicts:
	Test1/Test1.xcodeproj/project.pbxproj
	Test1/Test1.xcodeproj/project.xcworkspace/xcuserdata/matt.xcuserdatad/UserInterfaceState.xcuserstate