Fix conflicts

Author: mckenziearts

.gitignore

@@ -2,3 +2,6 @@
 /.vscode
 /.vagrant
 .idea
+/vendor
+composer.lock
+package-lock.json

changelog.md

@@ -3,13 +3,26 @@
 All notable changes to `Shopper` will be documented in this file.
 
 ## Version 1.0
+### Added
+- Laravel-mail-editor
+- Documentation
+- Coupon Management
+- Discount Management
+
+### Updated
+- Shopper installation command
+
+### Fixed
+- Error migration on order management
 
+## Version 1.0.2-beta
 ### Added
-- Everything
+- Filemanager
 
-### Version 1.0.2-beta
-- Add Filemanager
+## Version 1.0.1-beta 
+### Remove
+-  Creation of admin user during shopper installation
 
-### Version 1.0.0
-- Add Laravel-mail-editor
-- Add documentation
+## Version 1.0.0-beta 
+### Added
+- Everything

package.json

@@ -30,6 +30,7 @@
     "react": "^16.2.0",
     "react-dom": "^16.2.0",
     "react-dropzone-component": "^3.2.0",
+    "react-hot-loader": "^4.8.0",
     "react-loaders": "^3.0.1",
     "react-number-format": "^4.0.5",
     "react-quill": "^1.3.3",