initial drop
package.json settings
Merge remote-tracking branch 'origin/master'