+x on quadtree.js
remove accidental ^M's from sprite.js
clean up git mergetool mess