Development branch test commit
Merge branch 'dev'

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