From: Joseph Spiros Date: Thu, 2 Jun 2011 21:09:11 +0000 (-0400) Subject: Merge branch 'gh-pages' of git://github.com/lapilofu/philo into gh-pages X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/07358a0e08bfaa601cd385d0b0854e5b78eea543?hp=a3b1d23a83cda00d20950b715c291d00c40ae915 Merge branch 'gh-pages' of git://github.com/lapilofu/philo into gh-pages * 'gh-pages' of git://github.com/lapilofu/philo: Updated the first container example image so Oberlin is not highlighted as a misspelling and to draw more attention to the container line. (People seemed confused by the large block of code otherwise.) --- diff --git a/CNAME b/CNAME new file mode 100644 index 0000000..bb7213d --- /dev/null +++ b/CNAME @@ -0,0 +1 @@ +philocms.org diff --git a/index.html b/index.html index cb5d739..1b7a9c2 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,18 @@ +

@@ -138,4 +150,4 @@

- \ No newline at end of file +