         forgotPassword = forgot
     }
     
-<<<<<<< Updated upstream
-=======
-    func checkTextSufficientComplexity( text : String) -> Bool{
-        
-        
-        let capitalLetterRegEx  = ".*[A-Z]+.*"
-        let texttest = NSPredicate(format:"SELF MATCHES %@", capitalLetterRegEx)
-        let capitalresult = texttest.evaluateWithObject(text)
-        print("\(capitalresult)")
-        
-        
-        let numberRegEx  = ".*[0-9]+.*"
-        let texttest1 = NSPredicate(format:"SELF MATCHES %@", numberRegEx)
-        let numberresult = texttest1.evaluateWithObject(text)
-        print("\(numberresult)")
-        
-        
-        let specialCharacterRegEx  = ".*[!&^%$#@()/]+.*"
-        let texttest2 = NSPredicate(format:"SELF MATCHES %@", numberRegEx)
-        
-        let specialresult = texttest2.evaluateWithObject(text)
-        print("\(specialresult)")
-        
-        return capitalresult && numberresult && specialresult
-        
-    }
 
->>>>>>> Stashed changes
+    
     
     @IBAction func login(sender: NSButton)
     {

                {
                    NSUserDefaults.standardUserDefaults().setObject(userName.stringValue, forKey: "username")
                }
<<<<<<< Updated upstream
                keyChain.set(password.stringValue, forKey: Keychain_keyName)
                if (password.stringValue.characters.count > 6 )
                {

    }
}


