completed sign in page and login page routes
fixing merge conflict
added flashcard delete controller
forgot to add /edit to the end of the edit#flashcards route
Merge branch 'master' into armen-flashcards-view
hi
Fixed syntax error and create deck form
added list of all decks to decks#index view
created seed.rb file and corrected broken associations
Login function fully functional
refactored and fixed bug in user password authentication
decks view. shouldn't be commiting this
merge conflict
fixed merge conflict
Merge pull request #4 from armenvartan/faux-master

Faux master