Merge pull request #192 from aeternas/master

Resolved merge conflict

ReachabilityMacSample/ViewController.swift

@@ -49,11 +49,7 @@ class ViewController: NSViewController {
         self.updateLabelColourWhenNotReachable(reachability)
       }
     } else {
-<<<<<<< HEAD
-      NSNotificationCenter.defaultCenter().addObserver(self, selector: #selector(ViewController.reachabilityChanged(_:)), name: ReachabilityChangedNotification, object: reachability)
-=======
       NotificationCenter.default.addObserver(self, selector: #selector(ViewController.reachabilityChanged(_:)), name: ReachabilityChangedNotification, object: reachability)
->>>>>>> feature/ios10
     }
   }