Pre Alpha
UI Finished
Merge branch 'DEMO' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/game/IInput.java
	DiamondTest/src/com/cnc/diamond/game/ILogic.java
	DiamondTest/src/com/cnc/diamond/game/Logic.java