+ sysos out
Merge branch 'master' of https://github.com/franciscopagliaricci/ba_subway_simulator

Conflicts:
	src/Station.java

+ graphic pos passed from station to train