fixed conflict

app/assets/stylesheets/origami.scss

@@ -148,6 +148,10 @@
 	background-color:#7a62d3;
 }
 
+.orange{
+	 background-color:#FF7F50;
+}
+
 .red {
 	background-color:#ff0000;
 }

app/views/origami/payments/show.html.erb

@@ -241,8 +241,10 @@
   </div>
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- Waiter Buttons -->
+
     <button type="button" class="btn btn-primary btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
     <button type="button" class="btn btn-primary btn-block"> FOC </button>
+    <button type="button" class="btn btn-primary btn-block"> Void </button>
   </div>
   </div>