Merge branch 'master' of github.com:Migorec/diplom

git-svn-id: http://dev.iu7.bmstu.ru/svn/diploma_13_i-miniks@24 79f96485-305b-4f03-a84b-b5a3d3fbe729
Merge branch 'master' of github.com:Migorec/diplom