KateOl/it-school — pull request #9 by KateOl (2013-11-03 19:16:55+00:00)
Title: Conflict branch

Conflict source was created.