mer8/git_test_1 — pull request #2 by mer8 (2014-05-20 22:10:03+00:00)
Title: Mersbranch

I resolved those conflicts and added both of our awesome text!!