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

Conflicts:
	core/Map.h