Edit profile implemented
EDIT PROFILE MERGED WITH MASTER
Merge branch 'editprofile'

Conflicts:
	app/controllers/UsersController.php
	app/views/password/remind.blade.php
removed clock work, added magic the gathering to game, added mtg json file, fixed attribute_card migration, added mtg seeder + attributes
updated welcome page
Merge branch 'mtg_seeding'
email reminder now fixed
actually fixed password reminder
Merge branch 'master' of https://github.com/StyleASD/team_citadel into card_rating

Conflicts:
	app/views/emails/auth/reminder.blade.php