Merge remote-tracking branch 'origin/master'
added my .bashrc
Merge remote-tracking branch 'origin/master'