From bcb3aa1a1fb3b5e4d2c53bceb6e137e011173c48 Mon Sep 17 00:00:00 2001
From: Aaron Lindsay <aaron.lindsay@vt.edu>
Date: Sun, 20 Mar 2011 22:18:24 -0600
Subject: [PATCH] Moved /about/ page to /

---
 .gitignore      |  2 +-
 about/index.php | 24 ------------------------
 index.php       | 30 +++++++++++++++++++++++++++---
 tabs.php        |  2 +-
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 about/index.php

diff --git a/.gitignore b/.gitignore
index 2b7abdf..a6053e9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 #wordpress directory
-home/
+blog/
 
 cgi-bin/
 
diff --git a/about/index.php b/about/index.php
deleted file mode 100644
index 6849242..0000000
--- a/about/index.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php include("../header_top.php"); ?>
-<title>About - aclindsay.com</title>
-<?php include("../header_bottom.php"); ?>
-
-<div id="content">
-	<div id="main">
-		<h2>About</h2>
-
-		<p>I am a Lutheran, an Eagle Scout, and am currently pursuing a masters degree in Computer Science at Virginia Tech.</p>
-		<p>This website is home to <a href="http://aclindsay.com/blog/">my blog</a> about various personal and tech-related topics, <a href="http://aclindsay.com/projects">projects I have worked on</a>, and various other things including <a href="http://aclindsay.com/resume">my Resume</a> and <a href="http://aclindsay.com/calendar">my calendar</a>.</p>
-	</div>
-	<div id="sidebar">
-		<center><img src="http://aclindsay.com/graphics/aaron.jpg" style="padding: .5em; width: 90%;" /></center>
-		<h4>Links:</h4>
-		<ul>
-			<li><a href="http://aclindsay.com/contact">Contact Information</a></li>
-			<li><a href="http://aclindsay.com/resume">My Resume</a></li>
-			<li><a href="http://aclindsay.com/calendar/">My Calendar</a></li>
-			<li><a href="http://onetimeinmexico.wordpress.com/">This One Time in Mexico</a></li>
-		</ul>
-	</div>
-</div>
-
-<?php include("../footer.php"); ?>
diff --git a/index.php b/index.php
index f7a9117..b540011 100644
--- a/index.php
+++ b/index.php
@@ -1,3 +1,27 @@
-<?php
-header('Location: http://aclindsay.com/about/');
-?>
+<?php include("header_top.php"); ?>
+<title>Home - aclindsay.com</title>
+<?php include("header_bottom.php"); ?>
+
+<div id="content">
+	<div id="main">
+		<h2>Home</h2>
+
+		<p>Welcome to the personal website of Aaron Lindsay.</p>
+		<p>Here you can find my <a href="http://aclindsay.com/blog/">blog</a> about various personal, technology- and programming-related topics, some of the <a href="http://aclindsay.com/projects">projects</a> I have worked on, and other miscellany including my <a href="http://aclindsay.com/resume">resume</a>, <a href="http://aclindsay.com/calendar">calendar</a>, and <a href="http://aclindsay.com/contact/">contact information</a>.</p>
+
+		<h3>About Me</h3>
+		<p>I am a Lutheran Eagle Scout who is currently pursuing a masters degree in Computer Science at Virginia Tech.</p>
+	</div>
+	<div id="sidebar">
+		<center><img src="http://aclindsay.com/graphics/aaron.jpg" style="padding: .5em; width: 90%;" /></center>
+		<h4>Links:</h4>
+		<ul>
+			<li><a href="http://aclindsay.com/contact">Contact Information</a></li>
+			<li><a href="http://aclindsay.com/resume">My Resume</a></li>
+			<li><a href="http://aclindsay.com/calendar/">My Calendar</a></li>
+			<li><a href="http://onetimeinmexico.wordpress.com/">This One Time in Mexico</a></li>
+		</ul>
+	</div>
+</div>
+
+<?php include("footer.php"); ?>
diff --git a/tabs.php b/tabs.php
index 804fc33..c5ab608 100644
--- a/tabs.php
+++ b/tabs.php
@@ -2,7 +2,7 @@
 	<ul>
 		<?php
 		$tabs = array(
-			"About" => "/about/",
+			"Home" => "/",
 			"Blog" => "/blog/",
 			"Contact" => "/contact/",
 			"Projects" => "/projects/",