der
Merge branch 'master' of github.com:ral/dotfiles

Conflicts:
	.bash_profile