added tracers
tracking particle.js
merge conflict
Merge branch 'master' into gh-pages