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

Task 1