checkpoint
Deleted TriangleBlock for now
Added dependency on guava
tl;dr
Rebase fix