Merge branch 'master' of github.com:nguyenmanhphuc/DoAnA

Conflicts:
	Report.docx
Merge branch 'master' of github.com:nguyenmanhphuc/DoAnA

Conflicts:
	Report.docx