Add card routes and views
Merge remote-tracking branch 'upstream/master' into Anthony_edwards_Views

Conflicts:
	app/controllers/card.rb
Edit Card Controller
Connect Deck View to Card View
Merge pull request #9 from aedwards12/Anthony_edwards_Views

Anthony edwards views