git git git
Merge branch 'master' of https://github.com/hlian/batteries

Conflicts:
	.gitconfig