bashrc:prompt-color glitch fix
diary
tmux.conf.poweredge
Merge branch 'master' of github.com:amit666/bashrc

Conflicts:
	diary_November_2014.txt