updated cards view
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/views/cards.blade.php
	app/views/mtg-card.blade.php