temp
Merge branch 'master' of ssh://github.com/namriv05/environment

Conflicts:
	.bashrc
color at linux