commit from local
Merge branch 'master' of github.com:takryou79/work
commit from local