farewell roundballs
Merge branch 'EFFECT'

Conflicts:
	DiamondTest/bin/com/cnc/diamond/Diamond.class
	DiamondTest/bin/com/cnc/diamond/GameCamera.class
	DiamondTest/bin/com/cnc/diamond/LibgdxGame.class
	DiamondTest/bin/com/cnc/diamond/components/Dialog$1$1.class
	DiamondTest/bin/com/cnc/diamond/components/Dialog$1.class
	DiamondTest/bin/com/cnc/diamond/components/Dialog$2.class
	DiamondTest/bin/com/cnc/diamond/components/Dialog.class
	DiamondTest/bin/com/cnc/diamond/components/Fade.class
	DiamondTest/bin/com/cnc/diamond/components/Game$1$1.class
	DiamondTest/bin/com/cnc/diamond/components/Game$1.class
	DiamondTest/bin/com/cnc/diamond/components/Game$2.class
	DiamondTest/bin/com/cnc/diamond/components/Game$Input$1.class
	DiamondTest/bin/com/cnc/diamond/components/Game$Input.class
	DiamondTest/bin/com/cnc/diamond/components/Game.class
	DiamondTest/bin/com/cnc/diamond/components/Help$1$1.class
	DiamondTest/bin/com/cnc/diamond/components/Help$1.class
	DiamondTest/bin/com/cnc/diamond/components/Help.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$1.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$2.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$3.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$4$1.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$4.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$5$1.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$5.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$6$1.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$6.class
	DiamondTest/bin/com/cnc/diamond/components/Menu$Input.class
	DiamondTest/bin/com/cnc/diamond/components/Menu.class
	DiamondTest/bin/com/cnc/diamond/game/CommandPool.class
	DiamondTest/bin/com/cnc/diamond/game/GameInput.class
	DiamondTest/bin/com/cnc/diamond/game/Logic.class
	DiamondTest/bin/com/cnc/diamond/game/View$1.class
	DiamondTest/bin/com/cnc/diamond/game/View$2.class
	DiamondTest/bin/com/cnc/diamond/game/View.class
	DiamondTest/bin/com/cnc/diamond/ui/Bar.class
	DiamondTest/bin/com/cnc/diamond/ui/Button.class
	DiamondTest/bin/com/cnc/diamond/ui/IButton.class