Merge branch 'master' of github.com:zuongthao/linh_tinh

Conflicts:
	url_save_linktinh.txt
Merge branch 'master' of github.com:zuongthao/linh_tinh