The kittys dance!
Merge pull request #37 from zcdziura/develop

The kittys dance!
Merge pull request #7 from OctopodGames/develop

Cath up to Zach...