worked with Cristi and finished part1
Merge remote-tracking branch 'origin/Smara'