From 174bac73df1aad8d034d38346f83d28e781673ed Mon Sep 17 00:00:00 2001
From: System Administrator <justinkheisler@gmail.com>
Date: Fri, 13 Nov 2015 12:44:43 -0400
Subject: [PATCH 1/2] changing button type to button so that it doesnt submit
 prematurely, fixing image upload

---
 templates/model2.html | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/templates/model2.html b/templates/model2.html
index 58664ff..0857fe6 100644
--- a/templates/model2.html
+++ b/templates/model2.html
@@ -36,13 +36,14 @@ <h3 class="panel-title">Model</h3>
 				      <input type="submit" name="submit" value="Submit" id="submit">
 				      <input id="file" type="file" name="file" ng-model="file" onchange="$('#submit').click()"/>
 				    </div>
-				    <button class="btn btn-info" id="upload_btn" onclick="$('#file').click()"
-                                         {% if not user %} disabled {% endif %}>
+				    <button type="button" class="btn btn-info" id="upload_btn" 
+				    	onclick="$('#file').click()"
+             	{% if not user %} disabled {% endif %}>
 				      Upload image
-				    </button> 
+				    </button>
 				    <button type="button" class="btn btn-info" 
 					    onclick="window.location.href='/model_builder'"
-                                            {% if not user %} disabled {% endif %}>
+              {% if not user %} disabled {% endif %}>
 				      Make a wedge
 				    </button>
 				  </form>

From 5e1ce06c5a597a5f18fe52b67c58e8877a800828 Mon Sep 17 00:00:00 2001
From: System Administrator <justinkheisler@gmail.com>
Date: Fri, 13 Nov 2015 12:56:29 -0400
Subject: [PATCH 2/2] removing animation from flexslider, so Matt can sleep at
 night

---
 static/css/modelr.css | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/static/css/modelr.css b/static/css/modelr.css
index b130a7b..549af06 100644
--- a/static/css/modelr.css
+++ b/static/css/modelr.css
@@ -15,6 +15,22 @@ input {
   text-align: end;
 }
 
+.flex-direction-nav a {
+  text-decoration: none;
+  display: block;
+  width: 40px;
+  height: 40px;
+  margin: -20px 0 0;
+  position: absolute;
+  top: 50%;
+  z-index: 10;
+  overflow: hidden;
+  opacity: 0;
+  cursor: pointer;
+  color: rgba(0, 0, 0, 0.8);
+  text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.3);
+}
+
 .seismic-color {
   height: 10px;
   margin: 0;