Add add-on testing instructions
Fix index.js merge conflict
Fix index.html merge conflict