modifying the colors
Merge branch 'master' into color