Progress commit
Merge branch 'master' of https://github.com/adelorme82/CST383Assign3