KateOl/it-school — pull request #5 by KateOl (2013-11-03 14:12:43+00:00)
Title: Fix2

Merge fix2 and development.