Complete join queries for the Non-Student and Student tables. Removed @todo statements. Cleared the team calculation function.