Merge cake into soapy_cake
Merge pull request #8 from ad2games/merge_with_cake

Merge cake into soapy_cake