more work
Merge branch 'master' of github.com:jeromeetienne/threex

Conflicts:
	threex-2.0.0/TODO.md
	threex-2.0.0/npm4require.spec/npm4require-specs.md
	threex-2.0.0/npm4require.spec/todo.md