updating js
resolved merge conflicts
Merge pull request #3 from yenla/banana

updating js