Merge pull request #2 from archondigital/gh-pages

merge branches