error
Merge branch 'master' of https://github.com/vshall20/MyNewAppointmentProject

Conflicts:
	MyResources/CommonClass/MyDropDownViewController.m