fix makefile
skip cards which don't have images
spoiler: fix type
Merge branch 'master' into live