package.json
conflicts
Merge pull request #20 from chris-held/master

package.json