fixed?
commit to push
commit to push. again
Merge pull request #1 from pburge/gh-pages

merging gh-pages to master