Merge branch 'master' of git@github.com:mzp/scheme-abc

Conflicts:
	scm/example/scope.scm

diff --cc scm/example/scope.scm
index 10e37f0,a541c0a..6c2b70b
--- 1/scm/example/scope.scm
--- 2/scm/example/scope.scm
+++ b/scm/example/scope.scm
@@@ -3,5 -4,4 +4,4 @@@
          (if (<= n 1)
              1
              (* n (fact (- n 1))))))
- ;; scope
 -(trace (foo.fact 10))
 +(trace (foo.fact 10))