Merge branch 'master' of github.com:standardnotes/web

README.md

@@ -63,7 +63,7 @@ This repo contains the core code used in the web app, as well as the Electron-ba
 1. `bundle install`
 1. `npm install`
 1. `bundle exec rake bower:install`
-1. `grunt`
+1. `npm run build`
 1. `rails s`
 
 Open your browser to http://localhost:3000.

package.json

@@ -6,6 +6,7 @@
     "url": "https://github.com/standardnotes/web"
   },
   "scripts": {
+    "build": "grunt",
     "test": "karma start karma.conf.js --single-run"
   },
   "devDependencies": {