haha
Merge branch 'master' of https://github.com/zadbee/GoTechTask15
Conflict fixed:
Jun 6 15:34 by zb
Conflict fixed
Merge branch 'master' of https://github.com/zadbee/GoTechTask15
frontend
frontend merged
Backend halfway