Merge pull request #94 from marcel-blonk/BRIDGE-86

Medication tracker