C1 tharwat sprint0

@abdelrahmanMaged @BeshoSmile @HalaKamal 
Please review my code for final submission