C2 karimngr c5s08 09

#349 

the story is done please review according to the scenarios found in the backlog

@AmrARaouf @Omar-Hossam @Mirna-Yacout 
@m0hamed