Showing card slots. Fixed bug in sprites
Merge branch 'master' of https://github.com/cgibson/space-elves

Conflicts:
	data/game/defaultboard.py