Merge pull request #2 from megantaylor/gh-pages

I don't understand why this is happening
Merge pull request #3 from megantaylor/master

Merge pull request #2 from megantaylor/gh-pages