varie
varie
Merge branch 'master' of github.com:fmosca/dotfiles

Conflicts:
	.gitmodules
updates
updates