Merge branch 'master' of https://github.com/StyleASD/team_citadel into tweaks
moved image links and check to model
Merge branch 'master' of https://github.com/StyleASD/team_citadel into tweaks

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