SomeChange

some change
Resolve Con

Conflicts:
	bin/breakout/Ball.class
	src/breakout/Ball.java
resolve