IrinaUkrainets/TestRepo — pull request #2 by definetux (2014-06-08 20:52:31+00:00)
Title: Second merge!

Delete conflict