fix linting issues
fix linting issues
remove uglify option
added jshintrc
merge