Revert "Merge branch 'master' of github.com:alexey-malov/ood2014kurs"

This reverts commit 5cc5092cb65eb017b711e2fb2308ada360573a60, reversing
changes made to 6b1b9533c9ff6932260b8e47d8af7316a965389e.