ikki
ryouji
Merge pull request #11 from DevelopmentPractice201405/ryouji

ryouji
fix conflict
Merge pull request #5 from DevelopmentPractice201405/ikki

ikki
hello