<commit_before>{
  "name": "builders-game",
  "version": "1.0.0",
  "description": "crusher app will crush!",
  "private": true,
  "main": "index.js",
  "scripts": {
    "start": "node build/server.js",
    "dev-server": "node devServer.js",
    "build-server": "tsc --pretty",
    "build-client": "webpack --config webpack.config.js",
    "watch-server": "tsc --pretty -w & npm run test",
    "watch-client": "webpack --config webpack.config.js --watch & npm run test",
    "test": "mocha",
    "lint-ts": "eslint --parser typescript-eslint-parser src/**/*.ts"
  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/Hrr-19-crushers/builders-game.git"
  },
  "keywords": [],
  "author": "",
  "license": "ISC",
  "bugs": {
    "url": "https://github.com/Hrr-19-crushers/builders-game/issues"
  },
  "homepage": "https://github.com/Hrr-19-crushers/builders-game#readme",
  "devDependencies": {
    "@types/node": "^6.0.46",
    "@types/react": "^0.14.46",
    "@types/react-dom": "^0.14.18",
    "@types/express": "^4.0.33",
    "@types/socket.io": "^1.4.27",
    "@types/socket.io-client": "^1.4.28",
    "babel-core": "^6.18.2",
    "babel-eslint": "^7.1.0",
    "babel-loader": "^6.2.7",
    "babel-preset-es2015": "^6.18.0",
    "babel-preset-react": "^6.16.0",
    "chai": "^3.5.0",
    "eslint": "^3.9.1",
    "eslint-loader": "^1.6.1",
    "eslint-plugin-react": "^6.6.0",
    "mocha": "^3.1.2",
    "react-hot-loader": "^3.0.0-beta.6",
    "sinon": "^1.17.6",
    "ts-loader": "^1.1.0",
    "tslint": "^3.15.1",
    "tslint-react": "^1.1.0",
    "typescript": "^2.0.8",
    "typescript-eslint-parser": "^0.4.0",
    "typings": "^2.0.0",
    "webpack": "^1.13.3",
    "webpack-dev-server": "^1.16.2",
    "webpack-notifier": "^1.4.1"
  },
  "dependencies": {
    "@types/redux": "^3.6.31",
    "express": "^4.14.0",
    "@types/socket.io": "^1.4.27",
<<<<<<< 500a2cc144fd0847480fa30f111a5ac30cd33158
    "phaser": "^2.6.2",
=======
    "body-parser": "^1.15.2",
    "dotenv": "^2.0.0",
    "path": "^0.12.7",
>>>>>>> engine: get redis cache going
    "react": "^15.3.2",
    "react-dom": "^15.3.2",
    "redux": "^3.6.0",
    "socket.io": "^1.5.1",
    "socket.io-client": "^1.5.1",
    "redis": "^2.6.3"
  }
}<commit_msg>fixed package.json from rebase<commit_after>{
  "name": "builders-game",
  "version": "1.0.0",
  "description": "crusher app will crush!",
  "private": true,
  "main": "index.js",
  "scripts": {
    "start": "node build/server.js",
    "dev-server": "node devServer.js",
    "build-server": "tsc --pretty",
    "build-client": "webpack --config webpack.config.js",
    "watch-server": "tsc --pretty -w & npm run test",
    "watch-client": "webpack --config webpack.config.js --watch & npm run test",
    "test": "mocha",
    "lint-ts": "eslint --parser typescript-eslint-parser src/**/*.ts"
  },
  "repository": {
    "type": "git",
    "url": "git+https://github.com/Hrr-19-crushers/builders-game.git"
  },
  "keywords": [],
  "author": "",
  "license": "ISC",
  "bugs": {
    "url": "https://github.com/Hrr-19-crushers/builders-game/issues"
  },
  "homepage": "https://github.com/Hrr-19-crushers/builders-game#readme",
  "devDependencies": {
    "@types/node": "^6.0.46",
    "@types/react": "^0.14.46",
    "@types/react-dom": "^0.14.18",
    "@types/express": "^4.0.33",
    "@types/socket.io": "^1.4.27",
    "@types/socket.io-client": "^1.4.28",
    "@types/redux": "^3.6.31",
    "babel-core": "^6.18.2",
    "babel-eslint": "^7.1.0",
    "babel-loader": "^6.2.7",
    "babel-preset-es2015": "^6.18.0",
    "babel-preset-react": "^6.16.0",
    "chai": "^3.5.0",
    "eslint": "^3.9.1",
    "eslint-loader": "^1.6.1",
    "eslint-plugin-react": "^6.6.0",
    "mocha": "^3.1.2",
    "react-hot-loader": "^3.0.0-beta.6",
    "sinon": "^1.17.6",
    "ts-loader": "^1.1.0",
    "tslint": "^3.15.1",
    "tslint-react": "^1.1.0",
    "typescript": "^2.0.8",
    "typescript-eslint-parser": "^0.4.0",
    "typings": "^2.0.0",
    "webpack": "^1.13.3",
    "webpack-dev-server": "^1.16.2",
    "webpack-notifier": "^1.4.1"
  },
  "dependencies": {
    "express": "^4.14.0",
    "phaser": "^2.6.2",
    "body-parser": "^1.15.2",
    "dotenv": "^2.0.0",
    "path": "^0.12.7",
    "react": "^15.3.2",
    "react-dom": "^15.3.2",
    "redux": "^3.6.0",
    "socket.io": "^1.5.1",
    "socket.io-client": "^1.5.1",
    "redis": "^2.6.3"
  }
}
{'fraction_non_alphanumeric': 0.28789605653065875, 'fraction_numerical': 0.07636197857305675, 'mean_word_length': 2.756849315068493, 'pattern_counts': {'":': 129, '<': 10, '<?xml version=': 0, '>': 10, 'https://': 6, 'lorem ipsum': 0, 'www.': 0, 'xml': 0}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '2790974', 'n_tokens_mistral': 2091, 'n_tokens_neox': 1923, 'n_words': 299}