Merge branch 'master' of https://gitlab.com/makerlog/web into alinasava/web-dev-a