merge conflicts

StoryBook/ViewControllers/ViewController.swift

@@ -13,7 +13,7 @@ class ViewController: UIViewController {
 
 
     override func viewDidLoad() {
     override func viewDidLoad() {
         super.viewDidLoad()
         super.viewDidLoad()
-        print("Hello this is feature/development code")
+        print("Hello this is master")
     }
     }
 
 
     override func didReceiveMemoryWarning() {
     override func didReceiveMemoryWarning() {