before pull
before
Merge branch 'master' of https://github.com/PittCOE1186/COE1186FinalProject

Conflicts:
	TrainSystemSimulation/src/trainsystemsimulation/TrainModel.java
design review ppt