Formatting changes, package.json additions
Merge branch 'develop'