Mostly completed
Merge github.com:jcurless/CSE220