Merge branch 'master' of https://github.com/tuyendev/KTPM2013

Conflicts:
	Tamgiac.py
Merge branch 'master' of https://github.com/tuyendev/KTPM2013
Merge branch 'master' of https://github.com/tuyendev/KTPM2013