edit .bashrc
Merge branch 'master' of github.com:japacible/config