Conflicts: .gitignore README.md acorn.js package.json test/run.js test/tests-harmony.js test/tests-jsx.js