From b90a09d590cae3b3fb8a400fde18da9e3c45ff00 Mon Sep 17 00:00:00 2001
From: Andrew Walz <andrewjwalz@gmail.com>
Date: Mon, 29 May 2017 20:48:06 -0600
Subject: [PATCH] Commit after merge

---
 Source/SwiftyCamViewController.swift | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Source/SwiftyCamViewController.swift b/Source/SwiftyCamViewController.swift
index dbe7dd6..28d606d 100644
--- a/Source/SwiftyCamViewController.swift
+++ b/Source/SwiftyCamViewController.swift
@@ -238,13 +238,14 @@ open class SwiftyCamViewController: UIViewController {
 
 	override open func viewDidLoad() {
 		super.viewDidLoad()
-		previewLayer = PreviewView(frame: CGRect(x: 0.0, y: 0.0, width: view.bounds.width, height: view.bounds.height))
+        view = PreviewView(frame: view.frame)
+		previewLayer = view as! PreviewView!
 
 		// Add Gesture Recognizers
 
-		addGestureRecognizersTo(view: previewLayer)
+		addGestureRecognizersTo(view: view)
 
-		self.view.addSubview(previewLayer)
+		//self.view.addSubview(previewLayer)
 		previewLayer.session = session
 
 		// Test authorization status for Camera and Micophone
@@ -279,10 +280,10 @@ open class SwiftyCamViewController: UIViewController {
     /// ViewDidLayoutSubviews() Implementation
     
     
-    override open func viewDidLayoutSubviews() {
+    /*override open func viewDidLayoutSubviews() {
         previewLayer.frame = CGRect(x: 0.0, y: 0.0, width: view.bounds.width, height: view.bounds.height)
         super.viewDidLayoutSubviews()
-    }
+    } */
     
 	// MARK: ViewDidAppear