changing color
Merge branch 'feacture/style' into develop