bashrc ubuntu 14.04
14.04 profile
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc
	.profile
Merge branch 'master' of https://github.com/andregro/vimrc