Merge branch 'master' of https://github.com/minh93/thctd

Conflicts:
	Bai1/completed/w1.c
Scanner done