fck
Merge branch 'master' of https://github.com/minheel5/cis350Medicine

Conflicts:
	MedicineReminder/src/com/example/medicinereminder/AppointmentsActivity.java