trying again
Merge pull request #4 from keithknox/gh-pages

merge
Merge pull request #5 from keithknox/master

hopefully this will work