update
update
Merge branch 'master' of https://github.com/s-anton/TSystemsTask

Conflicts:
	compile-run.bat
	src/main/java/com/tsystems/javaschool/tasks/App.java
	src/main/java/com/tsystems/javaschool/tasks/Passenger.java
	src/main/java/com/tsystems/javaschool/tasks/Schedule.java
	src/main/java/com/tsystems/javaschool/tasks/Station.java
	src/main/java/com/tsystems/javaschool/tasks/Ticket.java
	src/main/java/com/tsystems/javaschool/tasks/Train.java
	target/classes/com/tsystems/javaschool/tasks/App.class
	target/classes/com/tsystems/javaschool/tasks/Passenger.class
	target/classes/com/tsystems/javaschool/tasks/Schedule.class
	target/classes/com/tsystems/javaschool/tasks/Station.class
	target/classes/com/tsystems/javaschool/tasks/Ticket.class
	target/classes/com/tsystems/javaschool/tasks/Train.class
	target/surefire-reports/TEST-com.tsystems.javaschool.tasks.AppTest.xml
	target/surefire-reports/com.tsystems.javaschool.tasks.AppTest.txt