Merge pull request #1 from markdessain/master

Updating pages to master
Merge pull request #2 from markdessain/gh-pages

Merge pull request #1 from markdessain/master