worked on the parallel errors
Merge branch 'master' of https://github.com/willetsely/cosc301_proj02
Merge branch 'master' of https://github.com/willetsely/cosc301_proj02