Merge branch 'master' of fozzie:projects/homepage

This commit is contained in:
Neale Pickett 2012-08-03 15:10:52 -06:00
commit 0d71b29110
3 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
Title: Neale Pickett Page Title: Neale Pickett Page
<img src="face.png" alt="☺" style="float: left; padding: 0.5em" /> <img src="face.png" alt="☺" style="float: left; padding: 0.5em; height: 5em;" />
One day a pirate walks into a bar with a steering wheel attached to his One day a pirate walks into a bar with a steering wheel attached to his
crotch. So the bartender says to him, "You know you have a steering crotch. So the bartender says to him, "You know you have a steering
wheel attached to your crotch?" wheel attached to your crotch?"

View File

@ -1,4 +1,4 @@
title: Running Audio/Visual for a Roller Derby Bout Title: Running Audio/Visual for a Roller Derby Bout
If you are a small team getting ready to bout, you are probably If you are a small team getting ready to bout, you are probably
worried about the audio and video requirements. worried about the audio and video requirements.

View File

@ -93,7 +93,7 @@ weather
section LA \ section LA \
'http://ladailypost.com/' \ 'http://ladailypost.com/' \
'http://ladailypost.com/feed/' 'http://www.ladailypost.com/rss.xml'
section "Ars Technica" \ section "Ars Technica" \
'http://m.arstechnica.com/' \ 'http://m.arstechnica.com/' \
'http://feeds.arstechnica.com/arstechnica/index?format=xml' 'http://feeds.arstechnica.com/arstechnica/index?format=xml'