Worked on adding DetailConciergeViewController to Storyboard and adding some code to the DetailConciergeViewController
fix merge conflicts
updates