commit
Merge branch 'master' of https://github.com/maxto/quants

Conflicts:
	test/testfun.js