Merge pull request #5 from doctorallen/simple

Simple
doctorallen · Apr 29, 2015 · ee963d0 · ee963d0
2 parents 050f135 + 0d75561
commit ee963d0
Show file tree

Hide file tree

Showing 94 changed files with 876 additions and 4,561 deletions.
diff --git a/.htaccess b/.htaccess
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: php
 php:
-  - 5.3
-  - 5.4
-  - 5.5
+    - 5.4
+    - 5.5
+    - 5.6
diff --git a/404.html b/404.html
diff --git a/about.html b/about.html
diff --git a/blog/index.php b/blog/index.php
diff --git a/composer.json b/composer.json
diff --git a/composer.lock b/composer.lock
diff --git a/contact-validate.php b/contact-validate.php
diff --git a/contact.html b/contact.html
diff --git a/css/blog.css b/css/blog.css