T2 youssef aly 56 edit trip

@ahmedsamouka @RanaMohsen  @moekage  @ahmedabdelhamied @boudy1522 
plz review my work it doesn't give conflict throw my own part. However the branch I checked out (Ahmed Nasser's) still has conflicts.