test merging
Merge branch 'master' of https://github.com/HugoJF/gym-subscription-manager