Adding jshint
Merging