Merge pull request #1 from luqmana/master
authorJacob Parker <j3parker@csclub.uwaterloo.ca>
Thu, 23 Feb 2012 18:17:45 +0000 (10:17 -0800)
committerJacob Parker <j3parker@csclub.uwaterloo.ca>
Thu, 23 Feb 2012 18:17:45 +0000 (10:17 -0800)
404 Error Index Fix + Set git to ignore .htaccess and config.d


Trivial merge