#fix linting
Merge branch 'master' of https://github.com/jobrapido/jr-highlight.js

Conflicts:
	jr-highlight.js