Merge branch 'foo' of https://github.com/renra/git_test into foo