added field
Merge branch 'local'

Conflicts:

TestSingleView.xcodeproj/project.xcworkspace/xcuserdata/evanz.xcuserdata
d/UserInterfaceState.xcuserstate
	TestSingleView/ViewController.h