rolled back "reverted commit"
Merge branch 'master' of https://github.com/outofmem/easymedicine