Merge pull request #1 from ameliapadua/seeding

Created seeding
Added migrations and models
Merge pull request #2 from ameliapadua/migrations

Added migrations and models
Created databases

Fixed quotations in csv definitions.  Fixed seeding hash and added
deck_id to seed hash.
Merge pull request #3 from ameliapadua/create-db

Created databases
Additional seeding

Seeded users, a single round, and guesses for round.  One mythical creature was not imported because of incorrect quotations marks.  Quotes were added back in.  So if reimport is needed make sure to add an additional Guess.create for 'Gorgon' term
Merge pull request #4 from ameliapadua/create-db

Additional seeding
Created login and logout

Added sessions to login and logout and basic session skeleton to use on each page.
Added create account functionality
Created deck.rb controller and moved get /deck

Also added My Stats link
Merge pull request #5 from ameliapadua/Login-CreateAccount-Logout

Login create account logout
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.
Created Stats page

Added stats get method.  Created stats erb.  Added border for stats table.
Fixed merge conflicts in application.css
Fixed part of stats page

When user has no rounds, was getting error.  Fixed it!
Fixed stats being outputed

Now allows for all rounds to be rendered to the page.  Added a totals column to also be printed out.
Added Decks title to the stats page

We also added my shitty short profile
Added page to edit user info.