klassnaya rabota 28/10/14
Merge branch 'master' into Liya_Ganeyeva
Merge branch 'Liya_Ganeyeva'