Merge js files
Merge branch 'master' of https://github.com/liezl200/diseasetracker