Merge pull request #63 from Gr1N/master

Рефакторинг проекта (issue #60)
Work on issue #60 (Refactor all static and templates)