First pass
Merge branch 'master' of https://github.com/cpitclaudel/6.830