this is the final commit for color master
Merge branch 'master' of github.com:billy1339/wdi_1_git_lab_colormaster