work in progress
Merge github.com:jcurless/CSE220
Phase2 almost complete
Merge branch 'master' of github.com:jcurless/CSE220