Phase 1
Merge github.com:jcurless/CSE220