modified gitconfig
Merge branch 'master' of github.com:yoneshin/dotfiles
modified .bashrc