Latest Commit
Merge branch 'master' of https://github.com/FIU-CIS-SeniorProject/MobileClinic

Conflicts:
	Source Code/Client/Client/Mobile
Clinic.xcodeproj/project.xcworkspace/xcuserdata/jamesmendez.xcuserdatad/
UserInterfaceState.xcuserstate
	Source Code/Client/Client/Mobile Clinic/MenuViewController.m
	Source Code/Client/Client/PatientObject.m
	Source Code/Local Server/Mobile
Clinic.xcodeproj/project.xcworkspace/xcuserdata/jamesmendez.xcuserdatad/
UserInterfaceState.xcuserstate
	Source Code/Local Server/Mobile
Clinic.xcodeproj/xcuserdata/jamesmendez.xcuserdatad/xcdebugger/Breakpoin
ts_v2.xcbkptlist
Last Commit
Merge branch 'James-Local-Sync'
Merge branch 'James-Local-Sync'
Superficial again
Merge branch 'master' into James-Local-Sync

Conflicts:
	Source Code/Client/Client/Mobile
Clinic.xcodeproj/project.xcworkspace/xcuserdata/jamesmendez.xcuserdatad/
UserInterfaceState.xcuserstate
	Source Code/Local Server/Mobile
Clinic.xcodeproj/project.xcworkspace/xcuserdata/jamesmendez.xcuserdatad/
UserInterfaceState.xcuserstate