Adding new methods
blblablaMerge branch 'master' of https://github.com/SkyPol0/IlikeTrains

Conflicts:
	src/server/Main.java
	src/server/TrainManager.java