fixed coloring
Merge branch 'master' of https://github.com/kalpas-team/hackaton.git