added @decks instance variable and potential set up for users controllers
Merge branch 'new_controllers'