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

Conflicts:
	application/controllers/index.html