C1 tharwat sprint1 #101 #102

@abdelrahmanMaged @BeshoSmile @HalaKamal 

Please review my code for merging