Merge overlapping tee markers
Make sure that both loops terminate
Merge pull request #23 from IngeniumGolf/merging-tees

Merge overlapping tee markers