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

Conflicts:
	Source Code/Local Server/BaseObject.h