classwork(11.11.14)
classwork
Merge branch 'master' into Liya_Ganeyeva