merge test
Merge pull request #1 from Eventalist/yoshiemuranaka

merge test