Merge pull request #8 from tylerphillips/gh-pages   merge master ... gh

merge master ... gh