Added .bashrc
merge