Added instructor function and fixed some errors with team assignment