Merge pull request #8 from jvrunion/gh-pages

Prototype merging
Merge pull request #9 from jvrunion/master

Merge pull request #8 from jvrunion/gh-pages