started to add color template
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
got colors to display properly, now working on functionality
got colors to change when clicking on them
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor