nowa porcja softu
Merge branch 'master' of https://github.com/Thetys/javaPraca

Conflicts:
	simRouter/Main.java