asdf
Merge branch 'master' of github.com:Chiel92/dotfiles

Conflicts:
	.bash_aliases