fix conflict in storyboard file

MyPlayground.playground/Contents.swift

@@ -19,4 +19,3 @@ func wordAtIndex(index:Int, inString str:NSString) -> NSString {
 
 wordAtIndex(20, inString: str)
 
-

MyPlayground.playground/contents.xcplayground

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='5.0' target-platform='osx'>
+<playground version='5.0' target-platform='osx' requires-full-environment='true'>
     <timeline fileName='timeline.xctimeline'/>
 </playground>

Simpler.xcodeproj/project.pbxproj

@@ -361,6 +361,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Simpler/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mortenjust.Simpler;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -373,6 +374,7 @@
 				COMBINE_HIDPI_IMAGES = YES;
 				INFOPLIST_FILE = Simpler/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
+				MACOSX_DEPLOYMENT_TARGET = 10.10;
 				PRODUCT_BUNDLE_IDENTIFIER = com.mortenjust.Simpler;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};

Simpler/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F1713" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="8191"/>
     </dependencies>
     <scenes>
         <!--Application-->

Simpler/SimpleWords.swift

@@ -44,6 +44,8 @@ class SimpleWords: NSObject {
         if digits.longCharacterIsMember((word.unicodeScalars.first?.value)!) {
             return true
         }
+        if String(word.characters.first!).rangeOfCharacterFromSet(NSCharacterSet.uppercaseLetterCharacterSet()) != nil
+        {return true}
         
 //        print("not simple, using dictionary")
         

Simpler/ViewController.swift

@@ -86,8 +86,6 @@ class ViewController: NSViewController, SimplerTextViewDelegate {
     }
     
     func simplerTextViewGotComplexWord() {
-
-        
         
         playBeginAnimation { () -> Void in
             self.playEndAnimation({ () -> Void in })