Final (?) version of CSCI C
Merge remote-tracking branch 'origin/master'