0.1 nadaljevanje vagon & lokomotiva
0.1 nadaljevanje vagon & lokomotiva
0.1 nadaljevanje vagon & lokomotiva
0.1 nadaljevanje vagon & lokomotiva
Merge branch 'develop' of https://github.com/Kochevar/APS1-Seminarska1 into develop

Conflicts:
	src/element.java
	src/vagon.java
0.1 brez novosti, težave s resetom