fixed medication bug
Merge pull request #128 from kmabey/LocalDev

fixed medication bug
Merge pull request #129 from kmabey/dev

Dev