Merge branch 'master' of https://github.com/MD04-TanTan/GitHub

Conflicts:
	FirstProject/.mtj.tmp/emulation/FirstProject.jad
	FirstProject/.mtj.tmp/emulation/FirstProject.jar
abc

xyz
Merge branch 'master' of https://github.com/MD04-TanTan/GitHub

Conflicts:
	FirstProject/.mtj.tmp/emulation/FirstProject.jad
	FirstProject/.mtj.tmp/emulation/FirstProject.jar