from vagrant
Merge branch 'master' of https://github.com/arcticf0x/exercism-js

Conflicts:
	bob/README.md
	bob/bob.js
	bob/bob_test.spec.js
	word-count/README.md
	word-count/word-count_test.spec.js