merge
Merge branch 'master' of https://github.com/odanado/dotfiles

Conflicts:
	.bashrc