test commit
Merge pull request #4 from tasukujp/add_conf

Add conf