merge test
Merge pull request #1 from Eventalist/yoshiemuranaka

merge test
Merge pull request #2 from Eventalist/tdshap

testing branch
Delete hello.txt
Delete something.txt