modified:   .bashrc
Merge branch 'stuff' of github.com:cardoppler/stuff into stuff