Delete Balle.java
test
local commit
config
Merge branch 'DepotZAC/master'

Conflicts:
	.gitignore
	srct/Balle.java