Merge pull request #2 from archondigital/gh-pages

merge branches
Merge pull request #3 from archondigital/master

Merge pull request #2 from archondigital/gh-pages