Merge pull request #36 from deini/dev

Remove conflicting code from watch.js
added logs
Merge branch 'log' into dev
Merge pull request #37 from alexmckenley/dev

added console logs