Merge branch 'master' of github.com:xwiki-labs/cryptpad

Conflicts:
	.travis.yml

.travis.yml

@@ -1,4 +1,8 @@
 language: node_js
-node_js:
+branches:
-  - "0.12"
+  only:
-script: npm run-script lint
+      - master
+      - diffdom
+      node_js:
+        - "0.12"
+

readme.md

@@ -20,10 +20,18 @@ to others who want to participate.
 To install:
 
     git clone <this repo>
+    cd cryptpad
     npm install
     npm install -g bower ## if necessary
     bower install
-    ## copy config.js.dist to config.js and modify configuration (use your own mongodb instance)
+
+    ## copy config.js.dist to config.js 
+    cp config.js.dist config.js
+
+    ## modify configuration to use your own mongodb instance
+    ## for example aon the default mongodb port `mongodb://localhost:27017/demo_database`
+    $EDITOR config.js
+
     node ./server.js