commiting errors
Merge branch 'master' of https://github.com/zhenyufu/Hanafuda-v0.0.1.git

Conflicts:
	src/com/usc/hanafuda/entities/HandPanel.java