Merge pull request #49 from nromanen/master

m->d
tmp
before merge
icons
Merge branch 'dmitry' of https://github.com/nromanen/ch018-2team- into dmitry
merge e->m
Merge pull request #51 from nromanen/dmitry

Dmitry
Merge pull request #54 from nromanen/master

m->e