Revert "Merge branch 'master' of https://github.com/pmlt/comp354"

This reverts commit daa860326095a8571ec2318285faebcd266728cb, reversing
changes made to aa1fd14ea3c493460c3c726fa4f9d4153642ca3f.