commits
cousinsitayo-
modified
Merge branch 'master' of https://github.com/MahjongGroup/MahjongJava

Conflicts:
	.gitignore
	src/client/datapack/GamePack.java
	src/client/system/BackgroundSystemOfClient.java
	src/client/system/DummyClient.java
	src/test/FirstSWT.java
	src/test/GlobalVar.java
	src/test/system/test/MainForMoseshi.java
Merge branch 'master' of https://github.com/MahjongGroup/MahjongJava

Conflicts:
	.gitignore
	src/client/datapack/GamePack.java
	src/client/system/BackgroundSystemOfClient.java
	src/client/system/DummyClient.java