Rework continues...
Merge branch 'master' of https://github.com/IKholopov/Lyceum2014