Merge pull request #9 from nguyen-phuoc-mulodo/task2

add task on task2
fix conflig
add task 1
Merge pull request #10 from nguyen-phuoc-mulodo/task1

Task 1
edit task.txt