clean up
up ho Tublood
Merge branch 'master' of https://github.com/tungha/DiamondTest into battleDemo