Merge branch 'master' into info

Author: helemork

README.md

@@ -5,13 +5,17 @@
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
 [![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 
-# Nin-innsyn
+# Natur i Norge (NiN) kart
 
-[![Screenshot](doc/screenshot.png "nin-innsyn screenshot")](https://nin.artsdatabanken.no)
+![image](https://user-images.githubusercontent.com/17450081/55809911-0804fa80-5ae7-11e9-83e8-31c835f239c9.png)
+
+
+## Nyttige lenker i prosjektet
 
 - [Webklient](https://nin.artsdatabanken.no)
 - [Laste ned åpne data](https://data.artsdatabanken.no/Natur_i_Norge)
-- [Bidra med data](docs/BidraMedData.md)
+- [Wiki til NiN-løsningen](https://github.com/Artsdatabanken/nin-kart-frontend/wiki/)
+- [Bidra med data](https://github.com/Artsdatabanken/nin-kart-frontend/wiki/%C3%98nsker-du-%C3%A5-bidra-med-data%3F)
 
 ## Relaterte prosjekter
 

package-lock.json

@@ -32,10 +32,12 @@
     "tangram": "^0.18.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.4.3",
     "@storybook/addon-actions": "^5.0.3",
     "@storybook/addon-links": "^5.0.3",
     "@storybook/addons": "^5.0.3",
     "@storybook/react": "^5.0.3",
+    "babel-loader": "^8.0.5",
     "coveralls": "^3.0.3",
     "enzyme": "^3.9.0",
     "enzyme-adapter-react-16": "^1.10.0",
@@ -45,9 +47,7 @@
     "lint-staged": "^8.1.5",
     "prettier": "^1.16.4",
     "pretty-quick": "^1.10.0",
-    "storybook-addon-material-ui": "^0.9.0-alpha.17",
-    "@babel/core": "^7.4.0",
-    "babel-loader": "^8.0.5"
+    "storybook-addon-material-ui": "^0.9.0-alpha.17"
   },
   "eslintConfig": {
     "extends": "react-app",