no message
Merge branch 'master' of ssh://github.com/jeremytripp/rendezvous

Conflicts:
	Rendezvous.xcodeproj/project.xcworkspace/xcuserdata/thomasmcgeehon.xcuserdatad/UserInterfaceState.xcuserstate