Initial commit
merging dev into master
indicating to npm to install package locally
Merge branch 'master' into dev