Merge branch 'ng' of https://github.com/neonxp/MathExecutor into neonxp-ng

# Conflicts:
#	src/NXP/Classes/Calculator.php
#	src/NXP/Classes/Lexer.php
#	src/NXP/Classes/Token/AbstractOperator.php
#	src/NXP/Classes/TokenFactory.php
#	src/NXP/MathExecutor.php

1 files changed, 32 insertions, 19 deletions

diff --git a/composer.json b/composer.json
index 8a5bd99..3098443 100644
--- a/composer.json
+++ b/composer.json
@@ -1,23 +1,36 @@
 {
-    "name": "nxp/math-executor",
-    "description": "Simple math expressions calculator",
-    "minimum-stability": "stable",
-    "keywords": ["math","parser","expression","calculator","formula","mathmatics"],
-    "homepage": "http://github.com/NeonXP/MathExecutor",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Alexander 'NeonXP' Kiryukhin",
-            "email": "frei@neonxp.info"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
+  "name": "nxp/math-executor",
+  "description": "Simple math expressions calculator",
+  "minimum-stability": "stable",
+  "keywords": [
+    "math",
+    "parser",
+    "expression",
+    "calculator",
+    "formula",
+    "mathmatics"
+  ],
+  "homepage": "http://github.com/NeonXP/MathExecutor",
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Alexander 'NeonXP' Kiryukhin",
+      "email": "a.kiryukhin@mail.ru"
     },
-    "require-dev": {
-        "phpunit/phpunit": "~7.0"
-    },
-    "autoload": {
-        "psr-0": {"NXP": "src/"}
+    {
+      "name": "Bruce Wells",
+      "email": "brucekwells@gmail.com"
+    }
+  ],
+  "require": {
+    "php": ">=7.1"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "~7.0"
+  },
+  "autoload": {
+    "psr-0": {
+      "NXP": "src/"
     }
+  }
 }