local master mistake
1st commit
Merge branch 'BATTLEVIEW' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest-desktop/src/com/cnc/diamond/Main.java
	DiamondTest/src/com/cnc/diamond/game/AIInput.java