Merge pull request #32 from Semigradsky/master

Рефакторинг
Fix #31
Улучшен Room
Merge pull request #3 from yandex-shri-minsk-2014/master

Update