Merge branch 'master' of https://github.com/bhearsum/static-jacuzzis into allocator
Merge branch 'allocator' of https://github.com/catlee/static-jacuzzis into allocator
Allocate jacuzzis!
cleanup