Task 1 Merge

fixed my master !!