fixing card json
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	public/data/card.json