Merge pull request #11 from anas-ambri/anas-branch

Anas branch
Finalizing on color choice