Update
Merge branch 'master' of https://github.com/Nhom-Xay-Dung-Phan-Mem/xdpm.nhomlon8.classicgoldminer

Conflicts:
	assets/font/TAHOMA.TTF