Fix conflicts

.gitignore

@@ -1,5 +1,4 @@
 dist
 node_modules
-.DS_Store
 .idea
-web-ext-artifacts
+.DS_Store

README.md

@@ -1,10 +1,14 @@
 # Solid Authentication Extension
 
-A firefox extension that replaces unauthenticated requests with authenticated Solid requests on Community Solid Servers.
+This FireFox extension replaces unauthenticated requests with authenticated Solid requests.
+This extension only works with WebIDs that use 
+the [Community Solid Server](https://github.com/CommunitySolidServer/CommunitySolidServer) 
+as identity provider.
 
 ## Client Credentials
 
-Requests are authenticated using the [Client Credentials API](https://communitysolidserver.github.io/CommunitySolidServer/5.x/usage/client-credentials/)
+Requests are authenticated using the 
+[Client Credentials API](https://communitysolidserver.github.io/CommunitySolidServer/5.x/usage/client-credentials/)
 
 The extension uses temporary access tokens that are created using either the client's email and password used on the server or a previously created id and secret linked to the user's WebID on the server.
 
@@ -29,7 +33,7 @@ The extension should now be running, both it's browser popup and the background
 If you can't find the extension icon which opens the popup window, it's most likely unpinned and hidden away in the extension menu which can be opened by clicking the jigsaw icon on the top right of the browser window.
 
 
-# Session
+## Session
 
 The extension will remember your credentials (ID & Secret combination) in your browser storage.
 
@@ -39,7 +43,7 @@ This will allow the extension to restore and reuse your previously generated id
 Because the extension is not [signed](https://support.mozilla.org/en-US/kb/add-on-signing-in-firefox) yet, it's [add-on id](https://extensionworkshop.com/documentation/develop/extensions-and-the-add-on-id/)
 is not static yet. Because of this, if you remove and reload the extension or restart your browser and reload the extension, the extension won't find it's previously saved credentials in the browser storage and you will have to log in again.
 
-# GET requests only
+## GET requests only
 
 At this time, the extension will only add authentication to GET requests.
 POST requests will not be blocked, but won't have any authentication either.
@@ -52,3 +56,7 @@ and [requesting access tokens from said url](https://github.com/KNowledgeOnWebSc
 To prevent an infinite loop of blocking web request listeners catching each other, any POST request that is caught, 
 [will be passed](https://github.com/KNowledgeOnWebScale/solid-authentication-browser-extension/blob/8211dab9b7a42fa98eeef37158084788e62d251a/src/js/background.js#L48-L50) 
 before any token url or access token is requested, and consequently any authentication is added.  
+
+## Screencast
+
+You find a screencast of the extension [here](https://cloud.ilabt.imec.be/index.php/s/QbabTcHkX2J8GHG).