Merge pull request #2 from megantaylor/gh-pages

merging