C3 toka sprint0

my new branch after it has been removed 
@yasmin-eltahan  @sarahahmed 
please merge