okay#3

SLSLSLSLS wants to merge 5 commits into

cmput301-w26:maincmput301-w26/lab-05:mainfrom

SLSLSLSLS:mainSLSLSLSLS/lab-05:mainCopy head branch name to clipboard