Merge pull request #1 from CartoonPhysics/gh-pages

Update Master
Merge pull request #2 from CartoonPhysics/master

Merge pull request #1 from CartoonPhysics/gh-pages