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

Conflicts:
Work Log.rtf
src/properties/PropertyBag.java
src/visualizer/Model.java
fixed merge issues