Sending pictures to ls
Merge branch 'Kevin's-Branch'
Merge Changes
Cloud Code
Cloud App
Merge branch 'Ernesto's-Branch'
Cloud App
Merge branch 'Ernesto's-Branch'
Merge branch 'master' of https://github.com/FIU-CIS-SeniorProject/MobileClinic
commit
Merge branch 'Kevin's-Branch'
Cloud and SQL updates
Face Recognition with id changes
Merge branch 'myBranch'

Conflicts:
	Source Code/Client/Client/BaseObject+Protected.h
	Source Code/Client/Client/BaseObject+Protected.m
	Source Code/Client/Client/BaseObject.m
	Source Code/Client/Client/ColorMe.m
	Source Code/Client/Client/CommonObjectProtocol.h
	Source Code/Client/Client/Database.h
	Source Code/Client/Client/MedicationObject.m
	Source Code/Client/Client/Mobile Clinic.xcodeproj/project.pbxproj
	Source Code/Client/Client/Mobile
Clinic.xcodeproj/project.xcworkspace/xcuserdata/jamesmendez.xcuserdatad/
UserInterfaceState.xcuserstate
	Source Code/Client/Client/Mobile
Clinic/CurrentDiagnosisViewController.h
	Source Code/Client/Client/Mobile
Clinic/CurrentDiagnosisViewController.m
	Source Code/Client/Client/Mobile Clinic/CurrentVisitViewController.m
	Source Code/Client/Client/Mobile Clinic/DoctorPatientViewController.m
	Source Code/Client/Client/Mobile
Clinic/DoctorPrescriptionViewController.m
	Source Code/Client/Client/Mobile Clinic/DoctorViewController.m
	Source Code/Client/Client/Mobile Clinic/FIUAppDelegate.m
	Source Code/Client/Client/Mobile Clinic/MenuViewController.h
	Source Code/Client/Client/Mobile Clinic/MenuViewController.m
	Source Code/Client/Client/Mobile Clinic/NewStoryboard.storyboard
	Source Code/Client/Client/Mobile
Clinic/PatientDashboardViewController.m
	Source Code/Client/Client/Mobile Clinic/PatientQueueViewController.m
	Source Code/Client/Client/Mobile Clinic/PharmacyPatientViewController.m
	Source Code/Client/Client/Mobile Clinic/PharmacyViewController.m
	Source Code/Client/Client/Mobile Clinic/SearchPatientViewController.m
	Source Code/Client/Client/Mobile Clinic/StationNavigationController.m
	Source Code/Client/Client/MobileClinicFacade.m
	Source Code/Client/Client/MobileClinicFacadeProtocol.h
	Source Code/Client/Client/ObjectFactory.h
	Source Code/Client/Client/PatientObject.m
	Source Code/Client/Client/PrescriptionObject.m
	Source Code/Client/Client/UserObjectProtocol.h
	Source Code/Client/Client/VisitationObject.m
	Source Code/Client/Client/VisitationObjectProtocol.h
	Source Code/Local Server/Database.m
	Source Code/Local Server/Mobile Clinic.xcodeproj/project.pbxproj
	Source Code/Local Server/Mobile
Clinic/Mobile_Clinic.xcdatamodeld/Mobile_Clinic.xcdatamodel/contents
	Source Code/Local Server/PatientObject.m
	Source Code/Local Server/PatientTable.xib
Merge branch 'master' of https://github.com/FIU-CIS-SeniorProject/MobileClinic

Conflicts:
	.gitignore
	Source Code/Local Server/CloudService.m
	Source Code/Local Server/Database.m
xcode bg stuffs
Merge branch 'master' of https://github.com/FIU-CIS-SeniorProject/MobileClinic

Conflicts:
	Source Code/Local Server/Mobile Clinic.xcodeproj/project.pbxproj
Fixing Project File Specifics
Initializing CMO
Merge branch 'master' of https://github.com/FIU-CIS-SeniorProject/MobileClinic

Conflicts:
	Source Code/Local Server/Mobile Clinic/MainMenu.m
	Source Code/Local Server/Mobile Clinic/en.lproj/MainMenu.xib