new file:   .bashrc
Merge branch 'master' of https://github.com/thomacer/config

Conflicts:
	.bashrc

	modified:   .bashrc
Merge branch 'master' of https://github.com/thomacer/config

 the commit.