almost nothing
missing()
Merging

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