More icons
Merge branch 'master' of https://github.com/cgibson/space-elves

Conflicts:
	data/cards/attack.json