calc
Merge branch 'master' of https://github.com/guojing0/scheme-code

Conflicts:
	README.md