closes #114, fixes #106
patch 1
patch 2
fuck sass
Merge pull request #115 from Team-Delta/task-1082

closes #114, fixes #106