compilation nearly ready
Merge branch 'master' of https://github.com/rideofyourlife/Symulator_pociagow

Conflicts:
	Train_Sim/Simulator.cpp
Merge branch 'master' of https://github.com/rideofyourlife/Symulator_pociagow