fixed overlap bug
Merge branch 'master' of https://github.com/benjamintoofer/cs56-jupi