added subtext and icontext, and changed coloring
Merge branch 'master' of https://github.com/UCCS-GDD/CS3350-HazardSweep.git