Cap nhat makefile va thuc thi
update
xu ly conflict
linh is just add a file
update readme.txt linhfish