Should fix all bugs
Merge branch 'master' of github.com:7Rius/dotfiles

Conflicts:
	prompt.bash