finished a merge

Author: Some-Dumb-Robot

css/styles.css

@@ -1,4 +1,10 @@
 /*------General----------*/
+
+
+/*
+ hi
+ */
+
 body {
   font-family: 'Open Sans', sans-serif;
   font-size: 16px;

index.html

@@ -10,10 +10,7 @@
 
 <meta charset="UTF-8"/>
 
-<title>Eventually EPICS</title>
-
-<meta name="description" content="Eat Restaurant Bootstrap Template">
-
+<title>UTSA EPICS</title>
 <meta name="author" content="webthemez">
 
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -91,9 +88,11 @@ <h3>Get start your next awesome project</h3>
 	    <div id="main-nav" class="collapse navbar-collapse">
 			 <ul class="nav navbar-nav">
 			  <li><a href="#header" class="scroll-link">Home</a></li>
-			  <li><a href="#gallery" class="scroll-link">Gallery</a></li>
-			  <li><a href="#feedback" class="scroll-link">Feedback</a></li>  
-			  <li><a href="#contact" class="scroll-link">Contact Us</a></li>
+			  <li><a href="#service" class="scroll-link">Our Services</a></li>
+			  <li><a href="#aboutUs" class="scroll-link">About Us</a></li>
+			  <li><a href="projects.html" class="scroll-link">Projects</a></li> 
+			  <li><a href="#feedback" class="scroll-link">Feedback</a></li> 
+			  <li><a href="#contact" class="scroll-link">Contact</a></li>
 			</ul>
       </div>
       </div>  
@@ -476,4 +475,4 @@ <h3>Phasellus non dolor nibh. Nullam elementum tellus pretium feugiat.<br>
 });
 </script>
 </body>
-</html>
+</html>