Starting Lab 3
Merge branch 'master' of git://github.com/dlhirsch/CS142A