Sergio Mattei

Maker.

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

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

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

Merge remote-tracking branch 'origin/alinasava/web-dev-a' into alinasava/web-dev-a

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

Revert "Switch to yarn!" This reverts commit 340ca0b292e4f1636a3ed4d7bcadaf6dec6e215c.

Work on making rest days automatic and a full refactor of the algorithm