Design Project Done
Merge branch 'master' of https://github.com/blkhp19/CMPT308