Commit arch
Merge branch 'master' of github.com:sebbbastien/dotfiles into github
Bcp de trucs
Merge branch 'master' of github.com:sebbbastien/dotfiles into github

Conflicts:
	.vimrc
Merge branch 'master' of github.com:sebbbastien/dotfiles
Merge branch 'github'