sound added
Merge branch 'master' of https://github.com/tungha/DiamondTest into resultScreen

Conflicts:
	DiamondTest/src/com/cnc/diamond/Diamond.java
fix sound