touch up changes
force erge branch 'touch'

Conflicts:
	.DS_Store
	Hatch.xcodeproj/project.xcworkspace/xcuserdata/guymorita.xcuserdatad/UserInterfaceState.xcuserstate