adding jshint plugin
fixing merge conflict