this is a test message
Merge branch 'tenki-test-b-kongb-20140403' into tenki-test-b-for-conflict-20140403