Merge branch 'gh-pages' of https://github.com/CoderDojoNYC/foodCompass into gh-pages

Conflicts:
	search.html

Author: jtutuncumacias

search.html

@@ -145,11 +145,21 @@
               <option value="trinidadian">Trinidadian</option>
               <option value="catalan">Catalan</option>
               <option value="cheesesteaks">Cheesesteaks</option>
+<<<<<<< HEAD
               <option value="chicken_wings">Chicken Wings</option>
               <option value="chinese">Chinese</option>
               <option value="cantonese">Cantonese</option>
               <option value="dimsum">Dim Sum</option>
               <option value="shanghainese">Shanghainese</option>
+=======
+
+<!--              
+              <option value="Chicken Wings", "chicken_wings"</option>
+              <option value="Chinese", "chinese"</option>
+              <option value="Cantonese", "cantonese"</option>
+              <option value="Dim Sum", "dimsum"</option>
+              <option value="Shanghainese", "shanghainese"</option>
+>>>>>>> FETCH_HEAD
               <option value="Szechuan", "szechuan"</option>
               <option value="Comfort Food", "comfortfood"</option>
               <option value="Creperies", "creperies"</option>
@@ -221,6 +231,7 @@
               <option value="Steakhouses", "steak"</option>
               <option value="Sushi Bars", "sushi"</option>
               <option value="Taiwanese", "taiwanese"</option>
+<<<<<<< HEAD
               <option value="tapas"</option>
               <option value="tapasmallplates">Tapas/Small Plates</option>
               <option value="tex-mex">Tex-Mex</option>
@@ -231,6 +242,19 @@
               <option value="vegan">Vegan</option>
               <option value="vegetarian">Vegetarian</option>
               <option value="vietnamese">Vietnamese</option>
+=======
+              <option value="Tapas Bars", "tapas"</option>
+              <option value="Tapas/Small Plates", "tapasmallplates"</option>
+              <option value="Tex-Mex", "tex-mex"</option>
+              <option value="Thai", "thai"</option>
+              <option value="Turkish", "turkish"</option>
+              <option value="Ukrainian", "ukrainian"</option>
+              <option value="Uzbek", "uzbek"</option>
+              <option value="Vegan", "vegan"</option>
+              <option value="Vegetarian", "vegetarian"</option>
+              <option value="Vietnamese", "vietnamese"</option>
+// -->
+>>>>>>> FETCH_HEAD
             </optgroup>
           </select>
         </div>

stylesheets/food-compass.css

@@ -21,7 +21,7 @@ header {
 
 #geolocate-button {
   display: inline-block;
-  background-image: url("images/Geolocation-icon.png");
+  background-image: url("../images/Geolocation-icon.png");
   height: 35px;
   width: 35px;
   cursor: pointer;
@@ -42,7 +42,7 @@ header {
 
 .start, .end, .time {
   font-size: 25px;
-  width: 90%;
+  width: 75%;
 }
 
 .styled-select {