Changes in load action
Merge branch 'master' of https://github.com/Seich/Hackathon-Migracion
Merge branch 'master' of https://github.com/Seich/Hackathon-Migracion

Conflicts:
	api/models/Card.js