lsをlinux用に変更
merge
Merge branch 'master' of github.com:phyten/dotfiles