starting on stage 2 functions
Merge branch 'master' of https://github.com/willetsely/cosc301_proj05