arrange segments more intelligently, and display trains on the map
Merge branch 'master' of github.com:timothyb89/cs314-tmcviz

Conflicts:
	pom.xml