updated url look and fixed hats problem
Merge branch 'master' of https://github.com/StyleASD/team_citadel

Conflicts:
	app/models/Card.php