mah changes
Merge branch 'mattsbranch' of https://github.com/retricide/chs-bb into mattsbranch

Conflicts:
	Ball.class
	Brick.class
	RectangleSpace$ScheduleTask.class
	RectangleSpace.class
	RectangleSpace.java