gem update fix
git config syntax
Merge branch 'master' of github.com:icco/dotFiles

Conflicts:
	link/gitconfig