Merge remote-tracking branch 'upstream/master'

Conflicts:
	Swift_Validator.podspec
	Validator/EmailRule.swift
	Validator/PasswordRule.swift
	Validator/ZipCodeRule.swift

Author: alejandro soto

.gitignore

@@ -0,0 +1,33 @@
+# Xcode
+#
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
+#
+# Pods/
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build

Validator.xcodeproj/project.xcworkspace/xcshareddata/Validator.xccheckout

@@ -10,7 +10,7 @@ import Foundation
 
 public class EmailRule: Rule {
 
-    var REGEX : String
+    private let REGEX: String
 
     public init(){
         self.REGEX = "[A-Z0-9a-z._%+-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,6}"
@@ -19,7 +19,7 @@ public class EmailRule: Rule {
     public init(regex:String){
         REGEX = regex
     }
-    
+
     public func validate(value: String) -> Bool {
         if let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX) {
             if test.evaluateWithObject(value) {

Validator.xcodeproj/project.xcworkspace/xcuserdata/jpotts18.xcuserdatad/UserInterfaceState.xcuserstate

@@ -29,7 +29,7 @@ public class PasswordRule : Rule {
     public init(regex:String){
         self.REGEX = regex
     }
-    
+
     public func validate(value: String) -> Bool {
         if let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX) {
             if test.evaluateWithObject(value) {

Validator.xcodeproj/xcuserdata/jpotts18.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -9,6 +9,7 @@
 import Foundation
 
 public class ZipCodeRule: Rule {
+
     private let REGEX: String
 
     init(){
@@ -17,7 +18,7 @@ public class ZipCodeRule: Rule {
     init(regex:String){
         self.REGEX = regex
     }
-    
+
     public func validate(value: String) -> Bool {
         if let test = NSPredicate(format: "SELF MATCHES %@", self.REGEX) {
             if test.evaluateWithObject(value) {