jshint activated
Merge pull request #5 from smonn/master

jshint activated