appointment page added
Conflict

Conflicts:
	customer/a/en.lproj/MainStoryboard.storyboard