test
Merge branch 'MedicationModel-enum' into medication
UIpickerView working