add a
Conflict解消
Conflict解消
Merge pull request #3 from youhei19880130/add_a

add a