gitconfig
Merge branch 'mac' of github.com:cagatay/home into mac

Conflicts:
	.gitconfig