Goodness too many edits for one commit.
Merge branch 'add_card_resource'

Conflicts:
	app/controllers/decks_controller.rb
	app/views/decks/index.html.erb