Revert "Revert "Merge branch 'master' of https://github.com/jinsumv/CMPE295BHealthcareApp""

This reverts commit 309b3603c2afecd25d512e1ed0a33ce243df6355.