work log update
Merge branch 'master' of https://github.com/MSherry24/se450TrafficSimulation

Conflicts:
	src/Model/CarTEST.java