"What is this commit?"
Revert ""What is this commit?""

This reverts commit 8fb8b423583e0d4b41e7785677e0c1d7f98b8aff.
"What is this commit?"
Merge branch 'master' of https://github.com/cchike/CIS350MedicineReminder

Conflicts:
	bin/classes/edu/upenn/medicinereminder/HomeActivity.class
	bin/classes/edu/upenn/medicinereminder/R$id.class
	bin/classes/edu/upenn/medicinereminder/R$layout.class
	bin/classes/edu/upenn/medicinereminder/R$menu.class
	bin/classes/edu/upenn/medicinereminder/R$string.class
	bin/classes/edu/upenn/medicinereminder/R$style.class
	bin/classes/edu/upenn/medicinereminder/UserInfoActivity.class
	gen/edu/upenn/medicinereminder/R.java
Merge branch 'master' of https://github.com/cchike/CIS350MedicineReminder