merged
merged
merged
Merge remote-tracking branch 'upstream/master'

Conflicts:
	img/dealers/bruised.png
	img/dealers/fifth.png
	img/dealers/medusa.jpg