kboutsika/exploreGit — pull request #2 by kboutsika (2013-07-14 17:01:12+00:00)
Title: test2

add a second line trying to cause conflicts