Built the deck controller and associated .erb files.
Merge branch 'master' into gameplay

Conflicts:
	flash-cards/app/controllers/deck.rb
	flash-cards/app/views/deck/index.erb
Merge pull request #6 from ameliapadua/gameplay

Built the deck controller and associated .erb files.