renamed some things
Merge branch 'master' of https://github.com/2-complex/polytrace

Conflicts:
	main.js