Corrected Setup
Merge branch 'final' of github.com:alvar21/clubs_2232 into final