resolving merge conflict

.gitignore

@@ -14,4 +14,4 @@ results
 node_modules
 npm-debug.log
 
-build/
+build/app.js

README.md

@@ -14,7 +14,7 @@ Getting started
 git clone git@bitbucket.org:ascribe/onion.git
 cd onion
 npm install
-npm run build
+npm run watch
 ```
 
 

index.html

@@ -11,6 +11,6 @@
             <p class="browserupgrade">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
         <![endif]-->
         <div id="main"></div>
-        <script src="js/bundle.js"></script>
+        <script src="build/app.js"></script>
     </body>
 </html>

package.json

@@ -4,8 +4,13 @@
   "description": "Das neue web client for Ascribe",
   "main": "js/app.js",
   "scripts": {
+<<<<<<< HEAD
     "start": "watchify -o js/bundle.js -v -d js/app.js",
     "build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > js/bundle.min.js",
+=======
+    "watch": "watchify -o build/app.js -v -d js/app.js",
+    "build": "browserify . -t [envify --NODE_ENV production] | uglifyjs -cm > build/app.js",
+>>>>>>> b000ecd925e2e23febd47b088384cf6d5d155a9c
     "test": "jest"
   },
   "author": "Ascribe",