Fixed multiple medications in json and finalized main.js
Merge remote-tracking branch 'origin/gh-pages'