2017 maintenance

andyault · May 3, 2017 · d0c74d8 · d0c74d8
2 parents 054d522 + f0f37e5
commit d0c74d8
Show file tree

Hide file tree

Showing 5 changed files with 266 additions and 184 deletions.
diff --git a/index.js b/index.js
@@ -172,8 +172,11 @@ app.get('/:project*', function(req, res, next) {
 
 		req.url = req.url.substr(req.params.project.length + 2);
 
+<<<<<<< HEAD
 		console.log(req.url);
 
+=======
+>>>>>>> f0f37e52421b5729c68d7b83114f23220c94f348
 		let index;
 
 		//if it doesn't end with an extension

diff --git a/public/assets/resume.pdf b/public/assets/resume.pdf
diff --git a/public/home (Conflicted copy from Andy’s MBP on 2016-09-21).html b/public/home (Conflicted copy from Andy’s MBP on 2016-09-21).html
diff --git a/public/home.html b/public/home.html
@@ -56,7 +56,7 @@ <h2 class="sub">I do programming, web &amp; graphic design.</h2>
 
 				<li id="about" class="padded labeled">
 					<div class="body">
-						<p class="c">I'm a 20 year old junior Information Systems major from Myrtle Beach, South Carolina.</p>
+						<p class="c">I'm a 21 year old senior Information Systems major from Myrtle Beach, South Carolina.</p>
 
 						<p>I got my start in programming over 8 years ago with a game called Half Life 2: Deathmatch. 
 						After accidentally joining a "cheat" server, a server made for the sole purpose of exploiting in-