Mise a jour
Merge branch 'master' of github.com:sieben/dotfiles

Conflicts:
	gitconfig