Added .gitconfig
Merge branch 'master' of github.com:dalazx/dotfiles

Conflicts:
	gitconfig