Merge pull request #4 from lievnano/dev

Merged work from development
Merge pull request #5 from lievnano/dev

added comma to package.json
Merge branch 'master' of https://github.com/di-inc/doit into dev