Merge pull request #5 from keithknox/master

hopefully this will work
Merge pull request #6 from keithknox/gh-pages

Merge pull request #5 from keithknox/master