Commited Bash History
Merge branch 'master' of https://github.com/raphdu57/dotfiles

Conflicts:
	bash/.bash_history