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

Conflicts:
	Rendezvous.xcodeproj/project.xcworkspace/xcuserdata/thomasmcgeehon.xcuserdatad/UserInterfaceState.xcuserstate
don't track this file
basic commit
Merge remote-tracking branch 'origin/jeremy'

Conflicts:
	Rendezvous.xcodeproj/project.xcworkspace/xcuserdata/thomasmcgeehon.xcuserdatad/UserInterfaceState.xcuserstate
Merge remote-tracking branch 'origin/jeremy'
Merge remote-tracking branch 'origin/jeremy' into tom
added project file
initial DB add working for user places
Merge remote-tracking branch 'origin/jeremy'
Merge remote-tracking branch 'origin/master' into tom

Conflicts:
	Rendezvous/PlacesViewController.m
Merge remote-tracking branch 'origin/jeremy'
Merge remote-tracking branch 'origin/jeremy' into tom

Conflicts:
	Rendezvous/PlacesViewController.m
Merge remote-tracking branch 'origin/tom'
Implemented MKLocalSearch and fetches URL and phone number to DetailVC