initial workspace7 commit from cgi laptop
Merge branch 'master' of https://github.com/straggler7/workspace7