Resolve merge conflicts

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,15 @@
+### Expected behavior
+
+_Please describe what should happen_
+
+### Actual behavior
+
+_Describe what actually happens_
+
+### Steps to reproduce
+
+_Explain what someone needs to do in order to see what's described in *Actual behavior* above_
+
+### Operating system and browser
+
+_e.g. Mac OS 10.11.6 Safari 10.0_

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,7 @@
+### Proposed changes
+
+_Describe what this Pull Request does_
+
+### Reason for changes
+
+_Explain why these changes should be made. Please include an issue # if applicable._

.travis.yml

@@ -6,11 +6,9 @@ sudo: false
 cache:
   directories:
   - node_modules
-env:
-  global:
-    secure: pgTtizuHLxuSOtDZ/DBoxcBeigRPiBTAuWo5Kn5wVtnXhqpWfzcT6DGe9vVwbaFLvb+zdY3pYmopAZnZTUCmGRGgPgNdE7BFwwCpMSbHHjtlHkcwCOwRUaNcW6iB9WjfwOM/I6UTy2N0OiUQdZcysW2ybdIxzYdYHElQE47kJHIecOoxJXRw/c0nv7MUkmVYnMt7gOqH2sK9kWyUDgDbtG4sCLb5LhN5/WFzUopACpN6VvAYaCIU8BTAAnb0XxIAD5mmBrOScbANTodnN4ubFjtNfMBd+j7h02bFBHbbJ73Z5gnRRonDos5kkRuFI08IV/0QauMwMSv2TKCVvsbaf53zWbfPkWr7zbj6gtisscfK0zEW9lTz7lvhyUeiPonzAqeV39gd+oPowWM5ZuyIZoawPbIvTJtGb4RlkEPI8OQST6O6g71hMksw0VDWDiLDneLCcHYFw7Q25qAkBg9P4ahH6McP4BB4gTJfQFKCDKvGYFsGrxM2IvYkXcZ0CdcatnNZGLsvHFk24sIQleLZPiCXOZKfp6zbNLwoJWhkoLz8aZ5hJoiRpoztyyrAdh6IL9MwZIgQ9KI10GfKpHmX5jbnh55KRc3G8a65fksHP5TFt2JjKtiN6A3oJAGzltdatW2TwlhyweEnjfpmtQcN8I4OKfgnsOcohcS+RaBNPCQ=
-before_install:
-- rm -rf node_modules/scratch-*
+install:
+- npm install
+- npm update
 after_script:
 - |
   # RELEASE_BRANCHES and NPM_TOKEN defined in Travis settings panel

CONTRIBUTING.md

@@ -0,0 +1,25 @@
+## Contributing
+The development of scratch-vm is an ongoing process,
+and we love to have people in the Scratch and open source communities help us along the way.
+
+If you're interested in contributing, please take a look at the
+[issues](https://github.com/LLK/scratch-vm/issues) on this repository.
+Two great ways of helping are by identifying bugs and documenting them as issues,
+or fixing issues and creating pull requests. When submitting pull requests please be patient
+-- it can take a while to find time to review them.
+The organization and class structures can't be radically changed without significant coordination
+and collaboration from the Scratch Team, so these types of changes should be avoided.
+
+It's been said that the Scratch Team spends about one hour of design discussion for every pixel in Scratch,
+but some think that estimate is a little low. While we welcome suggestions for new features in our
+[suggestions forum](https://scratch.mit.edu/discuss/1/) (especially ones that come with mockups), we are unlikely to accept PRs with
+new features that haven't been thought through and discussed as a group. Why? Because we have a strong belief
+in the value of keeping things simple for new users. To learn more about our design philosophy,
+see [the Scratch Developers page](https://scratch.mit.edu/developers), or
+[this paper](http://web.media.mit.edu/~mres/papers/Scratch-CACM-final.pdf).
+
+Beyond this repo, there are also some other resources that you might want to take a look at:
+* [Community Guidelines](https://github.com/LLK/scratch-www/wiki/Community-Guidelines) (we find it important to maintain a constructive and welcoming community, just like on Scratch)
+* [Open Source forum](https://scratch.mit.edu/discuss/49/) on Scratch
+* [Suggestions forum](https://scratch.mit.edu/discuss/1/) on Scratch
+* [Bugs & Glitches forum](https://scratch.mit.edu/discuss/3/) on Scratch

package.json

@@ -12,7 +12,8 @@
   "main": "./dist.js",
   "scripts": {
     "prepublish": "./node_modules/.bin/webpack --bail",
-    "start": "make serve",
+    "start": "webpack-dev-server",
+    "build": "webpack --colors --progress",
     "test": "make test",
     "version": "./node_modules/.bin/json -f package.json -I -e \"this.repository.sha = '$(git log -n1 --pretty=format:%H)'\""
   },