adding vertices and hexes to each other
Merge conflicts resolved