Merge branch 'master' of https://github.com/wrb/testing_github_client

Conflicts:
	file.md
merge?