Conflicts: acorn.js docs/acorn.html package.json test/tests.js
Conflicts: .gitignore README.md acorn.js index.html package.json