Merge pull request #34 from ToonTalk/master

Updating gh-pages to master