Initial commit.
Merge branch 'master' of github.com:mass/git-friend

Conflicts:
	README.md