Conflict resolution

README.md

@@ -4,7 +4,7 @@
 
 The library needs nodeJS installed and the following node packages installed globally: typescript, karma, tslint. This can be done by the command line:
 
-`npm install -g typescript karma tslint`
+`npm install -g typescript`
 
 Then, you can install the necessary packages of the library: 
 `npm install`
@@ -12,7 +12,7 @@ Then, you can install the necessary packages of the library:
 
 ### For compiling the typescript code
 
-`npm build`
+`npm run build`
 
 
 ### For compiling and testing the code with karma
@@ -22,7 +22,7 @@ Then, you can install the necessary packages of the library:
 
 ### For flagging suspicious language usage
 
-`npm lint`
+`npm run lint`
 
 
 ### UML visualisation
@@ -34,4 +34,4 @@ For installing tsviz: `npm install -g tsviz`
 There's currently a bug on debian like distribution due to a wrong declaration of graphviz path in the code: https://github.com/joaompneves/tsviz/issues/5
 To work around, you can create a link to the good path: `sudo ln -s /usr/bin/dot /usr/local/bin/dot` 
 
-For drawing the diagram: `npm viz`
+For drawing the diagram: `npm run viz`