Merge branch 'master' into James-Local-Sync
Merge branch 'James-Local-Sync' of https://github.com/FIU-CIS-SeniorProject/MobileClinic into James-Local-Sync