Added foo - very important
Merge branch 'foo' of https://github.com/renra/git_test into foo
Merge pull request #1 from renra/foo

Foo
Added baz
Merge pull request #2 from renra/baz

Baz
Merge branch 'master' of https://github.com/renra/git_test
Tweaked baz