Merge branch 'dev' into dynamicLogo-branch

additionalScripts.js

@@ -1,3 +1,4 @@
+
 var vals = [
 	`<h1 class="devOsan"">
               <span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan
@@ -19,4 +20,9 @@ window.onload=generateLogo(Math.floor(Math.random()*vals.length));
 function generateLogo(numb) {
 	document.getElementById("devOsanLogo-dynamic").innerHTML=vals[numb];
 	document.getElementById("devOsanMiniLogo-dynamic").innerHTML=vals2[numb];
-} 
+} 
+
+$(function(){
+	var navMain = $(".navbar-collapse");
+	navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');});
+}); 

index.html

@@ -150,9 +150,30 @@
         <div class="col-sm-6" id="projects">
           <h3><i class="fas fa-code-branch"></i><br />Projects</h3>
           <br />
-          <p>Bus GPS</p>
-          <p>{dev}Osan Website</p>
-          <p>Pending Game Engine</p>
+          <div id="projectCarousel" class="carousel slide" data-ride="carousel">
+			<div class="carousel-inner">
+				<div class="carousel-item active" data-interval="10000">
+					<h3>Bus GPS</h3>
+					<p>Kevin Falting</p>
+				</div>
+				<div class="carousel-item" data-interval="10000">
+					<h3>{dev}Osan Website</h3>
+					<p>{dev}Osan Club</p>
+				</div>
+				<div class="carousel-item" data-interval="10000">
+					<h3>Pending Game Engine</h3>
+					<p>Joshua Sigona</p>
+				</div>
+			</div>
+			<a class="carousel-control-prev" href="#projectCarousel" role="button" data-slide="prev">
+				<span class="carousel-control-prev-icon" aria-hidden="true"></span>
+				<span class="sr-only">Previous</span>
+			</a>
+			<a class="carousel-control-next" href="#projectCarousel" role="button" data-slide="next">
+				<span class="carousel-control-next-icon" aria-hidden="true"></span>
+				<span class="sr-only">Next</span>
+			</a>
+		  </div>
         </div>
       </div>
     </div>
@@ -205,7 +226,7 @@
       src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
       integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
       crossorigin="anonymous"
-    ></script>
-	<script src="additionalScripts.js"></script>
+    ></script
+    <script src="additionalScripts.js"></script>
   </body>
 </html>