Merge pull request #1 from danielsaurus/gh-pages

init2
Merge pull request #2 from danielsaurus/master

Merge pull request #1 from danielsaurus/gh-pages