Merge pull request #1 from thatkevin/gh-pages

Pull done
Merge pull request #2 from thatkevin/master

Merge pull request #1 from thatkevin/gh-pages