fixed conflicts, button shows
Merge pull request #6 from Tablesalt/gh-pages

fixed conflicts, button shows