Marie&Aneeshe's work. work left for Christine/Chloe
Merge pull request #1 from mmargishvili15/master

Marie&Aneeshe's work. work left for Christine/Chloe