Merge pull request #45 from kevinzurek/feature-triage

Feature triage
fixed pharmaciesController
Merge pull request #46 from kevinzurek/feature-medical

Feature medical
fixed pharmaciesController
missed part of merge conflict
merging
Merge pull request #47 from DPalombo/pharmacy-layout

Pharmacy layout