Merge branch 'master' into translation/json-cs

1 files changed, 15 insertions, 15 deletions

diff --git a/swift.html.markdown b/swift.html.markdown
index 86a0b89a..a40e86c8 100644
--- a/swift.html.markdown
+++ b/swift.html.markdown
@@ -3,7 +3,7 @@ language: swift
 contributors:
   - ["Grant Timmerman", "http://github.com/grant"]
   - ["Christopher Bess", "http://github.com/cbess"]
-  - ["Joey Huang", "http://github.com/kamidox"]  
+  - ["Joey Huang", "http://github.com/kamidox"]
   - ["Anthony Nguyen", "http://github.com/anthonyn60"]
 filename: learnswift.swift
 ---
@@ -74,7 +74,7 @@ if someOptionalString != nil {
     if someOptionalString!.hasPrefix("opt") {
         print("has the prefix")
     }
-    
+
     let empty = someOptionalString?.isEmpty
 }
 someOptionalString = nil
@@ -99,7 +99,7 @@ anyObjectVar = "Changed value to a string, not good practice, but possible."
 
 /*
     Comment here
-    
+
     /*
         Nested comments are also supported
     */
@@ -298,7 +298,7 @@ print(numbers) // [3, 6, 18]
 // Structures and classes have very similar capabilites
 struct NamesTable {
     let names = [String]()
-    
+
     // Custom subscript
     subscript(index: Int) -> String {
         return names[index]
@@ -329,7 +329,7 @@ public class Shape {
 
 internal class Rect: Shape {
     var sideLength: Int = 1
-    
+
     // Custom getter and setter property
     private var perimeter: Int {
         get {
@@ -340,11 +340,11 @@ internal class Rect: Shape {
             sideLength = newValue / 4
         }
     }
-    
+
     // Lazily load a property
     // subShape remains nil (uninitialized) until getter called
     lazy var subShape = Rect(sideLength: 4)
-    
+
     // If you don't need a custom getter and setter,
     // but still want to run code before and after getting or setting
     // a property, you can use `willSet` and `didSet`
@@ -354,19 +354,19 @@ internal class Rect: Shape {
             print(someIdentifier)
         }
     }
-    
+
     init(sideLength: Int) {
         self.sideLength = sideLength
         // always super.init last when init custom properties
         super.init()
     }
-    
+
     func shrink() {
         if sideLength > 0 {
             --sideLength
         }
     }
-    
+
     override func getArea() -> Int {
         return sideLength * sideLength
     }
@@ -398,13 +398,13 @@ class Circle: Shape {
     override func getArea() -> Int {
         return 3 * radius * radius
     }
-    
+
     // Place a question mark postfix after `init` is an optional init
     // which can return nil
     init?(radius: Int) {
         self.radius = radius
         super.init()
-        
+
         if radius <= 0 {
             return nil
         }
@@ -458,7 +458,7 @@ enum Furniture {
     case Desk(height: Int)
     // Associate with String and Int
     case Chair(String, Int)
-    
+
     func description() -> String {
         switch self {
         case .Desk(let height):
@@ -497,7 +497,7 @@ protocol ShapeGenerator {
 
 class MyShape: Rect {
     var delegate: TransformShape?
-    
+
     func grow() {
         sideLength += 2
 
@@ -532,7 +532,7 @@ extension Int {
     var customProperty: String {
         return "This is \(self)"
     }
-    
+
     func multiplyBy(num: Int) -> Int {
         return num * self
     }