From 689799639496d5f6b05be5c64f1ca94e3fe964bd Mon Sep 17 00:00:00 2001
From: cktricky <ken.johnson@nvisiumsecurity.com>
Date: Mon, 14 Oct 2013 08:42:27 -0400
Subject: [PATCH] merged

---
 app/views/tutorials/guard.html.erb.orig | 33 +++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100755 app/views/tutorials/guard.html.erb.orig

diff --git a/app/views/tutorials/guard.html.erb.orig b/app/views/tutorials/guard.html.erb.orig
new file mode 100755
index 0000000..f0ff6d1
--- /dev/null
+++ b/app/views/tutorials/guard.html.erb.orig
@@ -0,0 +1,33 @@
+<div class="dashboard-wrapper">
+	<div class="main-container">
+		<div class="row-fluid">
+		    <div class="span6">
+		      <div class="widget">
+		        <div class="widget-header">
+					<div class="title">
+			            <span class="fs1" aria-hidden="true" data-icon="&#xe012;"></span> Using Guard with Brakeman and Bundle-Audit
+			          </div>
+				</div>
+				<div class="widget-body">
+					<iframe src="http://player.vimeo.com/video/63901340" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe>
+		        </div>  
+			</div>
+		</div>
+	</div>
+</div>
+
+
+
+<script type="text/javascript">
+
+function openSub(){
+<<<<<<< HEAD
+=======
+	$('li[id="guard"]').addClass('active');
+>>>>>>> d2bc7d740aceb0627b81789ab00b9f1d2e2c9730
+	$('li[id="submenu"]').addClass('active open');
+};
+
+$(document).ready(openSub);
+
+</script>
\ No newline at end of file