Add sample git config
Rename
add gitconfig
add diff
Merge branch 'master' of github.com:ivarb/git

Conflicts:
	README.md