add a.txt
Merge branch 'master' of https://github.com/naotospace/dotfiles into company_base
edit a.txt
Merge branch 'company_base'