Merge remote-tracking branch 'origin/master' into standings

# Conflicts:
#	pubspec.lock
#	pubspec.yaml

pubspec.yaml

@@ -14,7 +14,8 @@ description: A sports app for UNC-Charlotte 49ers
 version: 1.0.0+1
 
 environment:
-  sdk: ">=2.1.0 <3.0.0"
+  #sdk: ">=2.1.0 <3.0.0"
+  sdk: ">=2.6.0 <3.0.0"
 
 dependencies:
   flutter:
@@ -27,12 +28,12 @@ dependencies:
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^0.1.2
+  table_calendar:
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
@@ -60,6 +61,8 @@ flutter:
     - assets/school_logos/UTEP.png
     - assets/school_logos/UTSA.png
     - assets/school_logos/wku.png
+    - images/male.png
+    - images/female.png
 
   # An image asset can refer to one or more resolution-specific "variants", see
   # https://flutter.dev/assets-and-images/#resolution-aware.