Updating git
Merge branch 'master' of github.com:blutgens/dotfiles

Conflicts:
	.gitignore