Revert "Merge branch 'master' of https://github.com/efferifick/cmput291"

This reverts commit 8a2cde07797efe9a5df082bec6255d764caa399b, reversing
changes made to 2b6bc01bb4501e30587e057c1465d0d4a17c4611.