d
Merge remote-tracking branch 'origin/master'

Conflicts:
	test1.1/src/card/Cards.java
Merge remote-tracking branch 'origin/master'