added flashcard delete controller
forgot to add /edit to the end of the edit#flashcards route
Merge branch 'master' into armen-flashcards-view
hi
added list of all decks to decks#index view
created seed.rb file and corrected broken associations
decks view. shouldn't be commiting this
merge conflict
fixed merge conflict
Merge pull request #4 from armenvartan/faux-master

Faux master
added category table. added the association to the seed file
Merge pull request #5 from armenvartan/armen-categories

added category table. added the association to the seed file
moved forms into homepage. did some css to the homepage
Merge pull request #6 from armenvartan/armen-categories

moved forms into homepage. did some css to the homepage
deck things. changed name of flashcards#create to a partial for the future
fixed a typo. got things ready to run ajax request for create deck, so that upon creation of deck, you stay on the same page and start adding flashcards to the deck
halfway through deck view
formatting js file
added bycrypt
type=password in login and signup
changed gemfile to 2.0.0