redone
Merge branch 'master' of https://github.com/MinskLab2012/2013-Feb-Module-7