doing some work
Merge branch 'master' of https://github.com/willetsely/cosc301_proj05