added new feature
No conflict
I want to sleep
Merge pull request #1 from ryokango/feature1

Add a new feature