wip
Merge branch 'master' of github.com:ftomassetti/codemodels-js

Conflicts:
	lib/codemodels/js/parser.rb