Merge branch 'master' of https://github.com/makoteq/eco-hack

package.json

@@ -6,7 +6,11 @@
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",
+<<<<<<< HEAD
     "bootstrap": "^5.1.1",
+=======
+    "ol": "^6.8.1",
+>>>>>>> c77bcb5be9d815db6e76418a774d28f46d0fd4e2
     "react": "^17.0.2",
     "react-bootstrap": "^2.0.0-rc.0",
     "react-dom": "^17.0.2",