...
..Merge branch 'master' of github.com:yielding/code

Conflicts:
	app/usbmux-proxy2/usbmux-proxy2.xcodeproj/project.xcworkspace/xcuserdata/yielding.xcuserdatad/UserInterfaceState.xcuserstate