expand path
Merge branch 'master' of github.com:byxorna/dotfiles

Conflicts:
	bashrc