files that have been done over the past week or 2
Merge branch 'master' of https://github.com/AKippins/CMPT-330-L111