20131213 oba
20131213 oba 余計なものを消した
20131213 oba creambread
20131213 oba poisonedman
Merge branch 'master' of github.com:MedibaWorkshop/workshop_G
20131213 oba

Conflicts:
	PoisonedMan.php
Merge branch 'master' of github.com:MedibaWorkshop/workshop_G

Conflicts:
	CurryBreadMan.php