Team numbers are now dynamic on the create-match page
Fixed conflict in js file
Merge branch 'master' of github.com:theyy29/ScoutingData

merging...?