added cup entity and spec
Merge branch 'master' of https://github.com/brandontbeasley/rabbits into brandon
merged
Merge branch 'master' of https://github.com/brandontbeasley/rabbits
Merge branch 'master' of https://github.com/brandontbeasley/rabbits
Merge branch 'master' of https://github.com/brandontbeasley/rabbits
started in memory spec