jshintrc
merged