Save from work
Merge branch 'master' of github.com:rkadeFR/dotbash

Conflicts:
	bash_aliases