mer8/git-test-2 — pull request #2 by mer8 (2014-05-21 00:03:21+00:00)
Title: Mersbranch

Hey here is my resolved merge conflict!