add20/github_test — pull request #4 by siwasu (2012-07-12 08:05:10+00:00)
Title: conflict fixed

3度目のコンフリクト