Forgot to push these
Merge branch 'zach-branch' into dev

Conflicts:
	PHMS/src/main/java/com/cse3310/phms/ui/activities/AddMedicationActivity.java
fix medication crash