test

Signed-off-by: moseshi <moseshi@gmail.com>
Merge remote-tracking branch 'origin/master' into moseshi
Merge branch 'master' into moseshi
first commit
second commit
message
first commit
Merge git://localhost/Majan

Conflicts:
	src/system/Rule.java
first commit
Merge git://192.168.0.13/Majan

Conflicts:
	.gitignore
	src/ai/AIType01.java
	src/debug/Debugger.java
	src/system/Functions.java
	src/system/Kyoku.java
	src/system/KyokuResult.java
	src/system/Mahjong.java
	src/system/Rule.java
	src/test/Main.java
create ScoreType.class
merge shishido repo
Mahjong ver0.1
Mahjong ver0.1 不要ファイルdelete
Mahjong ver0.1 pages追加
Mahjong Ver0.1 console
Mahjong ver0.1　立直の修正
Mahjong ver0.1 森署名追加
Mahjong Ver0.1 森署名追加２
Mahjong Ver0.1 今冨署名追加