sangrok_3

blah
Conflicts:
	MedicalAttendant/res/values/strings.xml
Merge branch 'master' of https://github.com/bbung24/18641

Conflicts:
	MedicalAttendant/res/values/strings.xml
merge error