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

Merge pull request #5 from keithknox/master
Merge pull request #7 from keithknox/master

final pull request