Hexagon bounceing implemented
Merge with master, conflicts solved
Attempted timer fix? Added states
fixed conflicts