KateOl/it-school — pull request #4 by KateOl (2013-11-03 13:53:12+00:00)
Title: Merge development and master.

Merge development and master.