main
commit

Conflicts:
	README.md
	package.json
	quants.js
Merge branch 'master' of https://github.com/maxto/quants