stuff
Merge branch 'master' into SRYU-branch

Conflicts:
	FirePlane/bin/subjects/Plane.class
	FirePlane/bin/subjects/Stuff.class
	FirePlane/bin/ui/GamePanel.class
	FirePlane/src/subjects/Plane.java
	FirePlane/src/subjects/Stuff.java