bl bla
Merge branch 'master' of github.com:mkatrenik/dotfiles

* 'master' of github.com:mkatrenik/dotfiles:
  edited gitconfig

Conflicts:
	.gitconfig