prepare to code sound
chord
Chord Screen upgrade
merger with profile screen
Merge branch 'master' of https://github.com/tungha/DiamondTest into resultScreen

Conflicts:
	DiamondTest-desktop/src/com/cnc/diamond/Main.java
merge fix + clean