first draft done
Merge branch 'master' of https://github.com/cjosephson/267FinalDesign
edited