vphant/TestRep — pull request #4 by vphant (2014-01-10 12:36:25+00:00)
Title: Task2

fix conflict