changed the UI to the later version of the prototype got rid of about
and replaced it with the contacts and got rid of refills replaced it
with calendar
Merge branch 'master' of https://github.com/kapoor100/SE4351_class_project into kapoor100-master

Conflicts:
	MedMemory/AndroidManifest.xml
Fixed Doctor and Pharms buttons
Merge branch 'kapoor100-master'