hi
Merge branch 'master' of https://github.com/kellyinciong/PatientX

Conflicts:
	PatientX/PatientX.xcodeproj/project.xcworkspace/xcshareddata/PatientX.xccheckout