Merge pull request #1 from DeckOfPandas/gh-pages

Merge site???
Removed text from merge conflict