some changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	VirtualBongo/bin/bongoband/Main.class
	VirtualBongo/src/bongoband/Main.java