algrid/TestProject — pull request #3 by maximburdiean (2014-02-28 16:19:02+00:00)
Title: change 8 -> 10

somehow to trigger the conflict