update
Merge branch 'master' of https://github.com/cjshannon/3js-docscript

Conflicts:
	main.py
update
Merge branch 'master' of https://github.com/cjshannon/3js-docscript

Conflicts:
	main.py