Time for Medication
Automate Reminders
Merge branch 'master' of https://github.com/helloworld/Doctorkit

Conflicts:
	client/viewpatient.html