Merge pull request #2 from megantaylor/gh-pages

merging
Merge pull request #3 from megantaylor/master

Merge pull request #2 from megantaylor/gh-pages