rename Matrix3 to Matrix2x3
compatible with atom-shell
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/define.js