test1
Merge https://github.com/yoshie22/edu1 into master2
Merge pull request #3 from yoshie22/master2

Master2