all is done
Merge branch 'lopv2' of https://github.com/tungha/DiamondTest

Conflicts:
	DiamondTest/src/com/cnc/diamond/components/Game.java