changes in front-end
Merge branch 'master' of https://github.com/adin234/glowing-octo-happiness into front-end-changes