Hexagon bounceing implemented
Merge with master, conflicts solved