Merge branch 'master' of https://github.com/di-inc/doit into dev
fixed jshint errors in server
added gulpfile
Merge pull request #14 from lievnano/dev

Dev