diff --git a/README.md b/README.md
index 22f2a4e..6b2832a 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## StudentList
 
-This is a simple app that displays a list of students names. It is used to teach GitHub pull requests.
+This is a simple app that displays a list of students names. It is used to teach basic git usage, including using GitHub pull requests.
 
 ## How To:
 
@@ -9,9 +9,9 @@ This is a simple app that displays a list of students names. It is used to teach
     ![Fork Button](.ReadmeImages/ForkButton.png)
 
 2. Clone your fork to your own machine using Tower, GitHub Desktop, or Terminal (your choice).
-3. In your local copy of the repo, create a new branch called "add-my-name".
+3. In your local copy of the repo, create a new branch called "add-my-name". (Optional)
 4. Open the StudentList Xcode project.
-5. Drag an image of yourself into the StudentList group under Resources. The image name should be your first name (e.g. "Anna.jpg").
+5. Drag an image of yourself into the StudentImages group under Resources. The image name should be your first name (e.g. "Anna.jpg").
 
     ![Drag Image into Xcode](.ReadmeImages/AddImage.gif)
 
diff --git a/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
index 36d2c80..d8db8d6 100644
--- a/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
+++ b/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,5 +1,15 @@
 {
   "images" : [
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "iphone",
+      "size" : "20x20",
+      "scale" : "3x"
+    },
     {
       "idiom" : "iphone",
       "size" : "29x29",
@@ -30,6 +40,16 @@
       "size" : "60x60",
       "scale" : "3x"
     },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "20x20",
+      "scale" : "2x"
+    },
     {
       "idiom" : "ipad",
       "size" : "29x29",
@@ -59,6 +79,16 @@
       "idiom" : "ipad",
       "size" : "76x76",
       "scale" : "2x"
+    },
+    {
+      "idiom" : "ipad",
+      "size" : "83.5x83.5",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "size" : "1024x1024",
+      "scale" : "1x"
     }
   ],
   "info" : {
diff --git a/Resources/Assets.xcassets/Contents.json b/Resources/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/Resources/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Resources/Assets.xcassets/Me.imageset/Contents.json b/Resources/Assets.xcassets/Me.imageset/Contents.json
new file mode 100644
index 0000000..f8f827e
--- /dev/null
+++ b/Resources/Assets.xcassets/Me.imageset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Resources/Base.lproj/Main.storyboard b/Resources/Base.lproj/Main.storyboard
index 153c0d1..50b54fa 100644
--- a/Resources/Base.lproj/Main.storyboard
+++ b/Resources/Base.lproj/Main.storyboard
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15F34" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="Iby-vr-ydM">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="Iby-vr-ydM">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
         <!--Students Collection View Controller-->
@@ -10,9 +14,9 @@
             <objects>
                 <collectionViewController id="Iby-vr-ydM" customClass="StudentsCollectionViewController" customModule="StudentList" customModuleProvider="target" sceneMemberID="viewController">
                     <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" dataMode="prototypes" id="gSt-uf-DLw">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="vus-Gc-drY">
                             <size key="itemSize" width="100" height="100"/>
                             <size key="headerReferenceSize" width="0.0" height="0.0"/>
@@ -40,13 +44,12 @@
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xRh-yq-RGO">
                                                     <rect key="frame" x="43" y="128" width="42" height="22"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                                    <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
                                         </stackView>
                                     </subviews>
-                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 </view>
                                 <constraints>
                                     <constraint firstItem="eKA-hX-Szv" firstAttribute="top" secondItem="oyt-zE-9qg" secondAttribute="top" id="Faa-Ia-wbK"/>
diff --git a/Resources/StudentImages/Aaron.JPG b/Resources/StudentImages/Aaron.JPG
deleted file mode 100644
index db8a1e7..0000000
Binary files a/Resources/StudentImages/Aaron.JPG and /dev/null differ
diff --git a/Resources/StudentImages/Andrew.png b/Resources/StudentImages/Andrew.png
deleted file mode 100644
index 9323692..0000000
Binary files a/Resources/StudentImages/Andrew.png and /dev/null differ
diff --git a/Resources/StudentImages/Jake.jpg b/Resources/StudentImages/Jake.jpg
new file mode 100644
index 0000000..9e0edd3
Binary files /dev/null and b/Resources/StudentImages/Jake.jpg differ
diff --git a/Resources/StudentImages/Joshua.jpg b/Resources/StudentImages/Joshua.jpg
deleted file mode 100644
index b5e25bf..0000000
Binary files a/Resources/StudentImages/Joshua.jpg and /dev/null differ
diff --git a/Resources/StudentImages/Kim.jpg b/Resources/StudentImages/Kim.jpg
new file mode 100644
index 0000000..bdd37be
Binary files /dev/null and b/Resources/StudentImages/Kim.jpg differ
diff --git a/Resources/StudentImages/Mike.jpg b/Resources/StudentImages/Mike.jpg
deleted file mode 100644
index 8400317..0000000
Binary files a/Resources/StudentImages/Mike.jpg and /dev/null differ
diff --git a/Resources/StudentImages/Photo on 10-21-16 at 4.21 PM.jpg b/Resources/StudentImages/Photo on 10-21-16 at 4.21 PM.jpg
deleted file mode 100644
index 7377552..0000000
Binary files a/Resources/StudentImages/Photo on 10-21-16 at 4.21 PM.jpg and /dev/null differ
diff --git a/Resources/StudentImages/Sean.jpg b/Resources/StudentImages/Sean.jpg
deleted file mode 100644
index d4d003b..0000000
Binary files a/Resources/StudentImages/Sean.jpg and /dev/null differ
diff --git a/Resources/StudentImages/Spencer.jpg b/Resources/StudentImages/Spencer.jpg
new file mode 100644
index 0000000..2f3215b
Binary files /dev/null and b/Resources/StudentImages/Spencer.jpg differ
diff --git a/Resources/StudentImages/Thorsten.png b/Resources/StudentImages/Thorsten.png
deleted file mode 100644
index 0cdd19d..0000000
Binary files a/Resources/StudentImages/Thorsten.png and /dev/null differ
diff --git a/Resources/StudentImages/Uldis.png b/Resources/StudentImages/Uldis.png
deleted file mode 100644
index 8c540ff..0000000
Binary files a/Resources/StudentImages/Uldis.png and /dev/null differ
diff --git a/Resources/StudentImages/drew.jpg b/Resources/StudentImages/drew.jpg
new file mode 100644
index 0000000..72ba282
Binary files /dev/null and b/Resources/StudentImages/drew.jpg differ
diff --git a/Resources/StudentImages/gelaina.jpg b/Resources/StudentImages/gelaina.jpg
deleted file mode 100644
index 0cf111b..0000000
Binary files a/Resources/StudentImages/gelaina.jpg and /dev/null differ
diff --git a/Sources/AppDelegate.swift b/Sources/AppDelegate.swift
index c8451d4..8692ec1 100644
--- a/Sources/AppDelegate.swift
+++ b/Sources/AppDelegate.swift
@@ -14,7 +14,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 
 	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
-		// Override point for customization after application launch.
+		print("Nick is like, super awesome")
+        print("Application started successfully")
 		return true
 	}
 }
diff --git a/Sources/StudentsCollectionViewController.swift b/Sources/StudentsCollectionViewController.swift
index 0f84144..eda227e 100644
--- a/Sources/StudentsCollectionViewController.swift
+++ b/Sources/StudentsCollectionViewController.swift
@@ -39,10 +39,10 @@ class StudentsCollectionViewController: UICollectionViewController {
 			}
 		}
 		
-		images = imageURLs.flatMap { (url) -> StudentImage? in
+		images = imageURLs.compactMap { (url) -> StudentImage? in
 			guard let imageData = try? Data(contentsOf: url),
 			let image = UIImage(data: imageData) else { return nil }
-			let name = url.deletingPathExtension().lastPathComponent ?? ""
+			let name = url.deletingPathExtension().lastPathComponent 
 			return StudentImage(image: image, name: name)
 		}
 	}
diff --git a/StudentList.xcodeproj/project.pbxproj b/StudentList.xcodeproj/project.pbxproj
index 1d72914..f1f3c53 100644
--- a/StudentList.xcodeproj/project.pbxproj
+++ b/StudentList.xcodeproj/project.pbxproj
@@ -113,12 +113,12 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 0730;
+				LastUpgradeCheck = 0930;
 				ORGANIZATIONNAME = DevMountain;
 				TargetAttributes = {
 					9DFE1BA01D26D51600F80375 = {
 						CreatedOnToolsVersion = 7.3.1;
-						LastSwiftMigration = 0800;
+						LastSwiftMigration = 0930;
 					};
 				};
 			};
@@ -196,13 +196,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -242,13 +252,23 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -267,6 +287,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.3;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
 			};
@@ -280,7 +301,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.DevMountain.StudentList;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -292,7 +314,8 @@
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.DevMountain.StudentList;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};