Minimal diff on gitignores
Merge branch 'master' of github.com:BenoitTigeot/dotfiles

Conflicts:
	.gitignore
Merge branch 'master' of github.com:BenoitTigeot/dotfiles
Clean merge of dotfiles of both computes