info
info
info
Merge branch 'master' of https://github.com/rideofyourlife/TrainSim

Conflicts:
	QTrainSim/mainwindow.cpp
	QTrainSim/mainwindow.h
	QTrainSim/qtrain.cpp