fixed  merge error
added js file
added js file
added index 2
Merge remote-tracking branch 'james/master'