fixed collision bug and started converting end marker to it's own object

Signed-off-by: mtjohns1 <mtjohns1@mtu.edu>
Merge branch 'master' of https://mtjohns1@github.com/TheLimitInfinity/Team-Software-Project.git

Conflicts:
	src/tsp/gui/Canvas.java