finished first run through of scheme
mege
Merge branch 'master' into gh-pages