accidentally left a <<<<<HEAD tag from the merge conflict
accidentally left a <<<<<HEAD tag from the merge conflict

bgilroy26/pickem_football,bgilroy26/pickem_football,bgilroy26/pickem_football,ConnorH2582/pickem_football,ConnorH2582/pickem_football,ConnorH2582/pickem_football