let the user add a deck and cards
fix merge conflict in application.js