no thing to chaneg

don't need change
Merge branch 'master' of https://github.com/hieuit7/PTCM.git

Conflicts:
	.gitignore
fix merge
Merge pull request #6 from MyHoangBui/master

ok