Merge pull request #10 from nguyen-phuoc-mulodo/task1

Task 1
edit task.txt
Merge pull request #11 from nguyen-phuoc-mulodo/task2

edit task.txt
Fix conflig