updated js
updated merge conflict
Merge pull request #53 from CTFigueroa/master

Updated merge conflict