commit
Merge branch 'master' of https://github.com/nyul/szoftlab4

Conflicts:
	code/bin/Enemy.class
	code/bin/Engine.class
	code/bin/Fellowship.class
	code/bin/Geometry.class
	code/bin/Main.class
	code/bin/Obstacle.class
	code/bin/PlayingArea.class
	code/bin/Road.class
	code/bin/Tile.class
	code/bin/Tower.class
	code/src/Fellowship.java
	code/src/Road.java